commit df760e5bff6b634ca61efd155d7c81446bbc301a
author Dan Willemsen <dwillemsen@google.com> Mon Jun 06 23:09:04 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 06 23:09:04 2016 +0000
tree 1e4e9461c9c37d1466bf7e4326cbb63c7181c103
parent e301bde6ecf15898150a1c659d8618cc6a352a7b
parent fc673854d7db6504976d445d3c5f63b7564800da

Build more soong binaries am: 2308f6557a am: 4be3597bc9
am: fc673854d7

* commit 'fc673854d7db6504976d445d3c5f63b7564800da':
  Build more soong binaries

Change-Id: I2504b0c0e5cf5e3b585c2077db5709bd840fa6e1

build-prebuilts.sh

diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index 0ece7dd..b7fff1a 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -44,10 +44,11 @@
 }
 EOF
     BUILDDIR=${SOONG_OUT} ./bootstrap.bash
-    ${SOONG_OUT}/soong ${SOONG_HOST_OUT}/bin/ckati ${SOONG_HOST_OUT}/bin/makeparallel ${SOONG_HOST_OUT}/bin/ninja ${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test
+    SOONG_BINARIES=( acp ckati ijar makeparallel ninja ziptime )
+    ${SOONG_OUT}/soong ${SOONG_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/} ${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test
     (
         cd ${SOONG_HOST_OUT}
-        zip -qryX build-prebuilts.zip bin/ lib*/
+        zip -qryX build-prebuilts.zip ${SOONG_BINARIES[@]/#/bin/} lib*/
     )
     ${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test
 fi