summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
author Jiakai Zhang <jiakaiz@google.com> 2023-06-12 11:18:12 +0100
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2023-06-12 16:28:51 +0000
commitc63a2b36d74dadb51a9cdcc71ad470111ebe3f02 (patch)
tree6a6d589d1f46193b2cb6d9738dca1747b4e714ef /tools
parentdac9d66a75c83c5aafb43a9bbd4df8db59c3132a (diff)
Avoid using soong_zip's "-e" flag for boot.zip.
aosp/23658853 changes boot.zip, which need to be cherry-picked to UDC. It uses soong_zip's "-e" flag to specify the filename to use in boot.zip for METADATA.txt. However, the "-e" flag doesn't exist on UDC. This change uses an alternative approach to avoid using the "-e" flag. Before this change, the contents were written to out/dist/boot.zip.METADATA.txt and then passed to soong_zip with "-e" to rename to file to "METADATA.txt". After this change, the contents are written to out/dist/boot_zip/METADATA.txt and then passed to soong_zip with "-j" to remove the directory name. Bug: 286381070 Test: m dist out/dist/boot.zip (on udc-dev) (cherry picked from https://android-review.googlesource.com/q/commit:34914f620bcc0339104ef0360f6a30492f407409) Merged-In: I769de5194b5716f05e5352f4efd635a70ba0b891 Change-Id: I769de5194b5716f05e5352f4efd635a70ba0b891
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions