diff options
author | Daniel Norman <danielnorman@google.com> | 2022-03-16 03:00:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-16 03:00:47 +0000 |
commit | d74b74010472ba957f4125b676a41c23ca91e549 (patch) | |
tree | fb0c6ce129ee56d3cf68dcc9c812c9959822597d | |
parent | e2bf51797ddb56f2094d3a0671c5c3281bbea2c3 (diff) | |
parent | b31f9d57ff14c129c3552f7c704902b777cf9735 (diff) | |
download | treble-d74b74010472ba957f4125b676a41c23ca91e549.tar.gz |
Allow inferred merge configs. am: 96d45412aa am: 42a14b7136 am: b31f9d57fft_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-release
Original change: https://android-review.googlesource.com/c/platform/tools/treble/+/2025624
Change-Id: I103a09e4748212500d70b32ff44f23efc689fd6d
-rwxr-xr-x | vf/merge.sh | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/vf/merge.sh b/vf/merge.sh index e8058b0..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 @@ -77,4 +76,4 @@ 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 |