summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-06-21 02:41:57 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-06-21 02:41:59 +0000
commitb52e88f26b49a20e5f34915db3c6801486b166de (patch)
tree176d730537720d88e7f45325a745d12c4e1ed3ad
parent8427c41256fffdf728a6307ce00c810372ed8c2f (diff)
parentc5042c77a9530588170b4ecdca0c53ce7f123ac6 (diff)
downloadbuild-tools-b52e88f26b49a20e5f34915db3c6801486b166de.tar.gz
Merge "Build soong_zip and zip2zip for prebuilts/build-tools"
-rwxr-xr-xbuild-prebuilts.sh17
1 files changed, 16 insertions, 1 deletions
diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index e39f6bd9..dc1b4977 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -39,7 +39,22 @@ if [ -n ${build_soong} ]; then
}
EOF
BUILDDIR=${SOONG_OUT} ./bootstrap.bash
- SOONG_BINARIES=( acp bpfmt ckati ckati_stamp_dump ijar makeparallel ninja ziptime header-abi-linker header-abi-dumper header-abi-diff merge-abi-diff)
+ SOONG_BINARIES=(
+ acp
+ bpfmt
+ ckati
+ ckati_stamp_dump
+ header-abi-linker
+ header-abi-dumper
+ header-abi-diff
+ ijar
+ makeparallel
+ merge-abi-diff
+ ninja
+ soong_zip
+ zip2zip
+ ziptime
+ )
SOONG_ASAN_BINARIES=( acp ckati ijar makeparallel ninja ziptime )
${SOONG_OUT}/soong ${SOONG_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/} ${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test
${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test