diff options
author | Daniel Norman <danielnorman@google.com> | 2022-03-14 21:53:37 +0000 |
---|---|---|
committer | Daniel Norman <danielnorman@google.com> | 2022-03-16 00:04:23 +0000 |
commit | 96d45412aaa0433a0a7df907a89284d0c5fb8d49 (patch) | |
tree | fb0c6ce129ee56d3cf68dcc9c812c9959822597d | |
parent | 799ecd323c5072fef26f995f23347ba32cdd63fe (diff) | |
download | treble-96d45412aaa0433a0a7df907a89284d0c5fb8d49.tar.gz |
Allow inferred merge configs.
Only provides merge config flags to merge_target_files if this script
is provided a MERGE_CONFIG_DIR.
Change-Id: Idbffb2ec40b0fd64313021ac228c262a9e44b3e4
-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 |