commit 014294594031b773aa1e15ebd9de216b7f34ef6e
author Dan Willemsen <dwillemsen@google.com> Wed Aug 09 21:00:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 09 21:00:35 2017 +0000
tree 57a0c9bd73a406929403dbfc93d2816bbaa122a6
parent 6829c4f39f023dc5bb4654ec237cecd67f6210d6
parent 36b23596fd6d82079ecc2e389be3147205d1ace9

Switch build-prebuilts.sh to soong_ui
am: 36b23596fd

Change-Id: Ia596a510c36764ab8b5ff3caacc38c52bd1b3e95

build-prebuilts.sh

diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index dc1b497..2d18d8d 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -38,7 +38,6 @@
     "HostSecondaryArch":"x86"
 }
 EOF
-    BUILDDIR=${SOONG_OUT} ./bootstrap.bash
     SOONG_BINARIES=(
         acp
         bpfmt
@@ -56,7 +55,7 @@
         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
+    build/soong/soong_ui.bash --make-mode --skip-make ${SOONG_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/} ${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test
     ${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test
     mkdir -p ${SOONG_OUT}/dist/bin
     cp ${SOONG_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/} ${SOONG_OUT}/dist/bin/
@@ -74,7 +73,7 @@
 }
 EOF
         rm -rf ${SOONG_HOST_OUT}
-        ${SOONG_OUT}/soong ${SOONG_ASAN_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/} ${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test
+        build/soong/soong_ui.bash --make-mode --skip-make ${SOONG_ASAN_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/} ${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test
         ${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test
         mkdir -p ${SOONG_OUT}/dist/asan/bin
         cp ${SOONG_ASAN_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/} ${SOONG_OUT}/dist/asan/bin/