diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 16:12:51 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 16:12:51 +0000 |
| commit | a92f1eaefd161d3561cf0274fe127091f21f8bf5 (patch) | |
| tree | fb0c6ce129ee56d3cf68dcc9c812c9959822597d | |
| parent | 50daf613917f3462d14b59e692f7f4c4fa54dcd0 (diff) | |
| parent | d74b74010472ba957f4125b676a41c23ca91e549 (diff) | |
| download | treble-android13-frc-resolv-release.tar.gz | |
Snap for 8512216 from d74b74010472ba957f4125b676a41c23ca91e549 to tm-frc-resolv-releaset_frc_res_330443000android13-frc-resolv-release
Change-Id: I9dfe04f2e4163b2ef8a418db156fdcfce06a4b00
| -rwxr-xr-x | vf/merge.sh | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/vf/merge.sh b/vf/merge.sh index 372bb0e..8e76241 100755 --- a/vf/merge.sh +++ b/vf/merge.sh @@ -11,7 +11,6 @@ while getopts ":t:d:v:b:m:r:" option ; do d) DIST_DIR=${OPTARG} ;; v) VENDOR_DIR=${OPTARG} ;; b) BUILD_ID=${OPTARG} ;; - # TODO(b/170638547) Remove the need for merge configs. m) MERGE_CONFIG_DIR=${OPTARG} ;; r) HAS_RADIO_IMG=${OPTARG} ;; *) echo "Unexpected argument: -${OPTARG}" >&2 ;; @@ -34,10 +33,6 @@ if [[ -z "${BUILD_ID}" ]]; then echo "error: -b build id argument not set" exit 1 fi -if [[ -z "${MERGE_CONFIG_DIR}" ]]; then - echo "error: -m merge config dir argument not set" - exit 1 -fi if [[ -z "${HAS_RADIO_IMG}" ]]; then HAS_RADIO_IMG="true" fi @@ -52,16 +47,20 @@ mv -f ${DIST_DIR}/${TARGET}-*.zip ${SYSTEM_DIR} source build/envsetup.sh lunch ${TARGET}-userdebug +EXTRA_FLAGS="" +if [[ "${MERGE_CONFIG_DIR}" ]]; then + EXTRA_FLAGS+=" --framework-item-list ${MERGE_CONFIG_DIR}/framework_item_list.txt \ + --framework-misc-info-keys ${MERGE_CONFIG_DIR}/framework_misc_info_keys.txt \ + --vendor-item-list ${MERGE_CONFIG_DIR}/vendor_item_list.txt" +fi out/host/linux-x86/bin/merge_target_files \ --framework-target-files ${SYSTEM_DIR}/${TARGET}-target_files*.zip \ --vendor-target-files ${VENDOR_DIR}/*-target_files-*.zip \ - --framework-item-list ${MERGE_CONFIG_DIR}/framework_item_list.txt \ - --framework-misc-info-keys ${MERGE_CONFIG_DIR}/framework_misc_info_keys.txt \ - --vendor-item-list ${MERGE_CONFIG_DIR}/vendor_item_list.txt \ --allow-duplicate-apkapex-keys \ --output-target-files ${DIST_DIR}/${TARGET}-target_files-${BUILD_ID}.zip \ --output-img ${DIST_DIR}/${TARGET}-img-${BUILD_ID}.zip \ - --output-ota ${DIST_DIR}/${TARGET}-ota-${BUILD_ID}.zip + --output-ota ${DIST_DIR}/${TARGET}-ota-${BUILD_ID}.zip \ + ${EXTRA_FLAGS} # Copy bootloader.img, radio.img, and android-info.txt, needed for flashing. cp ${VENDOR_DIR}/bootloader.img ${DIST_DIR}/bootloader.img @@ -70,6 +69,11 @@ if [[ $HAS_RADIO_IMG = "true" ]]; then cp ${VENDOR_DIR}/radio.img ${DIST_DIR}/radio.img fi +# Copy vendor otatools.zip, needed by sign_target_files_apks +if [[ -f "${VENDOR_DIR}/otatools.zip" ]]; then + cp ${VENDOR_DIR}/otatools.zip ${DIST_DIR}/otatools_vendor.zip +fi + unzip -j -d ${DIST_DIR} \ ${VENDOR_DIR}/*-target_files-*.zip \ - OTA/android-info.txt + OTA/android-info.txt
\ No newline at end of file |