diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:02:17 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:02:17 +0000 |
| commit | 5ff1a9d0a4e09dedb839beebbb6ee64e37adbcb4 (patch) | |
| tree | 959f5c2f87c4d25cd27a1cdb2c79c9f433bdbd3b | |
| parent | 2c56592b1efea2a22b0533656ccb64f96ccd603a (diff) | |
| parent | 401b2ec1bf5b2d4ddd7dc96ff7fdb1138f411465 (diff) | |
| download | common-android13-mainline-media-swcodec-release.tar.gz | |
Snap for 8570526 from 401b2ec1bf5b2d4ddd7dc96ff7fdb1138f411465 to mainline-media-swcodec-releaseaml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020android13-mainline-media-swcodec-release
Change-Id: Icedc196caf83273030e3490e51f53d9c67ba6704
| -rw-r--r-- | METADATA | 3 | ||||
| -rw-r--r-- | generate-factory-images-common.sh | 4 | ||||
| -rwxr-xr-x | generate-packages.sh | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/METADATA b/METADATA new file mode 100644 index 0000000..d97975c --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh index 55fa170..95f4e35 100644 --- a/generate-factory-images-common.sh +++ b/generate-factory-images-common.sh @@ -101,7 +101,7 @@ cat > tmp/$PRODUCT-$VERSION/flash-all.sh << EOF # See the License for the specific language governing permissions and # limitations under the License. -if ! [ \$(\$(which fastboot) --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 2802 ]; then +if ! [ \$(\$(which fastboot) --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3103 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi @@ -258,7 +258,7 @@ cat > tmp/$PRODUCT-$VERSION/flash-base.sh << EOF # See the License for the specific language governing permissions and # limitations under the License. -if ! [ \$(\$(which fastboot) --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 2802 ]; then +if ! [ \$(\$(which fastboot) --version | grep "version" | cut -c18-23 | sed 's/\.//g' ) -ge 3103 ]; then echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi diff --git a/generate-packages.sh b/generate-packages.sh index adcf05c..2ec4e22 100755 --- a/generate-packages.sh +++ b/generate-packages.sh @@ -84,7 +84,7 @@ do ONE_FILE_BASE=$(basename $ONE_FILE) - # Sanity check to make sure apk or jar files are not stripped + # Quick check to make sure apk or jar files are not stripped if [[ ${ONE_FILE_BASE} == *.apk ]] || [[ ${ONE_FILE_BASE} == *.jar ]] then zipinfo ${FILEDIR_NEW}/${ONE_FILE_BASE} | grep -q classes.dex > /dev/null @@ -96,6 +96,7 @@ do done echo \ \ Copying $COMPANY-specific LICENSE + cp $COMPANY/COPYRIGHT ${MAKEFILEDIR} || echo \ \ \ \ Error copying COPYRIGHT cp $COMPANY/LICENSE ${MAKEFILEDIR} || echo \ \ \ \ Error copying LICENSE echo \ \ Setting up $COMPANY-specific makefiles cp -R $COMPANY/staging/* $MAKEFILEDIR || echo \ \ \ \ Error copying makefiles |