diff options
author | Daniel Norman <danielnorman@google.com> | 2020-12-08 09:44:46 -0800 |
---|---|---|
committer | Daniel Norman <danielnorman@google.com> | 2020-12-08 18:19:24 +0000 |
commit | c38f8cf028a8034236cfe8043718f332c3b91e87 (patch) | |
tree | 3fc8c6f6f7b2c418e038001e0084f8869a41016f /vf | |
parent | c8007b0e665962df826386540d6af522359ffc3a (diff) | |
download | redfin-c38f8cf028a8034236cfe8043718f332c3b91e87.tar.gz |
Removes now-obsolete aosp_redfin_vf merge.sh.
This script has been moved to tools/treble/vf.
Test: n/a
Change-Id: I7ef8148b515e6100e5b567db888b33a285c0a359
Diffstat (limited to 'vf')
-rwxr-xr-x | vf/merge.sh | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/vf/merge.sh b/vf/merge.sh deleted file mode 100755 index 588313c..0000000 --- a/vf/merge.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -# Thin wrapper around merge_target_files to allow flag changes to be made in a -# presubmit-guarded change. - -set -e - -readonly DIST_DIR=$1 -readonly VENDOR_DIR=$2 -readonly BUILD_ID=$3 - -if [[ -z "${DIST_DIR}" ]]; then - echo "error: dist dir argument not set" - exit 1 -fi -if [[ -z "${VENDOR_DIR}" ]]; then - echo "error: vendor dir argument not set" - exit 1 -fi -if [[ -z "${BUILD_ID}" ]]; then - echo "error: build id argument not set" - exit 1 -fi - -# Move the system-only build artifacts to a separate folder -# so that the flashing tools use the merged files instead. -readonly SYSTEM_DIR=${DIST_DIR}/system_build -mkdir -p ${SYSTEM_DIR} -mv -f ${DIST_DIR}/android-info.txt ${SYSTEM_DIR} -mv -f ${DIST_DIR}/aosp_redfin_vf-*.zip ${SYSTEM_DIR} - -source build/envsetup.sh -lunch aosp_redfin_vf-userdebug - -out/host/linux-x86/bin/merge_target_files \ - --framework-target-files ${SYSTEM_DIR}/aosp_redfin_vf-target_files*.zip \ - --vendor-target-files ${VENDOR_DIR}/aosp_redfin-target_files-*.zip \ - --framework-item-list device/google/redfin/vf/framework_item_list.txt \ - --framework-misc-info-keys device/google/redfin/vf/framework_misc_info_keys.txt \ - --vendor-item-list device/google/redfin/vf/vendor_item_list.txt \ - --allow-duplicate-apkapex-keys \ - --output-target-files ${DIST_DIR}/aosp_redfin_vf-target_files-${BUILD_ID}.zip \ - --output-img ${DIST_DIR}/aosp_redfin_vf-img-${BUILD_ID}.zip \ - --output-ota ${DIST_DIR}/aosp_redfin_vf-ota-${BUILD_ID}.zip - -# Copy bootloader.img, radio.img, and android-info.txt, needed for flashing. -cp ${VENDOR_DIR}/bootloader.img ${DIST_DIR}/bootloader.img -cp ${VENDOR_DIR}/radio.img ${DIST_DIR}/radio.img -unzip -j -d ${DIST_DIR} \ - ${VENDOR_DIR}/aosp_redfin-target_files-*.zip \ - OTA/android-info.txt |