summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJingwen Chen <jingwen@google.com>2022-03-17 17:50:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-17 17:50:32 +0000
commitb34519f54dfbee4bed20895b2e4e38fe090012ea (patch)
tree493d0404478e087d3f117ecb42451c0602ffb035
parent7d1b6798484994ad9eb7255423c0472247c559f1 (diff)
parenta08303698dc0526958dddac8da7472058f7b0390 (diff)
downloadbuild-tools-b34519f54dfbee4bed20895b2e4e38fe090012ea.tar.gz
Add merge_zips (go_binary) to prebuilts. am: a08303698d
Original change: https://android-review.googlesource.com/c/platform/prebuilts/build-tools/+/2030523 Change-Id: I2632875854556a104361717632f34abd99eb05fc
-rwxr-xr-xbuild-prebuilts.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index dafa8e3b..5550c511 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -96,6 +96,7 @@ EOF
hidl-lint
m4
make
+ merge_zips
ninja
one-true-awk
openssl