summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJingwen Chen <jingwen@google.com>2022-03-17 19:25:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-17 19:25:44 +0000
commitd51c7b81264d925c6d6e377b643e8c6179935930 (patch)
tree493d0404478e087d3f117ecb42451c0602ffb035
parent343f787ec258da95f9be9d609b0652fc05523ce8 (diff)
parentb34519f54dfbee4bed20895b2e4e38fe090012ea (diff)
downloadbuild-tools-d51c7b81264d925c6d6e377b643e8c6179935930.tar.gz
Add merge_zips (go_binary) to prebuilts. am: a08303698d am: b34519f54d
Original change: https://android-review.googlesource.com/c/platform/prebuilts/build-tools/+/2030523 Change-Id: Ib85d78afaa2394ac44e0d746929443404fde44ed
-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