| commit | b42fa3a11e8d2287f797d40a97af3f145978cc19 | [log] [tgz] |
|---|---|---|
| author | Iavor-Valentin Iftime <valiiftime@google.com> | Fri Feb 18 05:16:30 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 18 05:16:30 2022 +0000 |
| tree | 689bd797138d2162840b9050f1f3c5c3942b0832 | |
| parent | 4224cb9dae1de68212de27d21edd8dc6cd5f6c90 [diff] | |
| parent | e2bf51797ddb56f2094d3a0671c5c3281bbea2c3 [diff] |
Copy vendor otatools.zip to destination folder am: 230bbd7db6 am: 799ecd323c am: cf7271d85d am: e2bf51797d Original change: https://android-review.googlesource.com/c/platform/tools/treble/+/1990750 Change-Id: I5102894bac77722462d9580818f6a513026b7be9
diff --git a/vf/merge.sh b/vf/merge.sh index 372bb0e..e8058b0 100755 --- a/vf/merge.sh +++ b/vf/merge.sh
@@ -70,6 +70,11 @@ 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