diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-08-08 15:56:11 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-08-08 15:56:25 -0700 |
| commit | 36b23596fd6d82079ecc2e389be3147205d1ace9 (patch) | |
| tree | 57a0c9bd73a406929403dbfc93d2816bbaa122a6 | |
| parent | 9c9ad2007ae0d5ce949d6995159309b8e697856e (diff) | |
| download | prebuilts_build-tools-o-iot-preview-5.tar.gz prebuilts_build-tools-o-iot-preview-5.tar.bz2 prebuilts_build-tools-o-iot-preview-5.zip | |
Switch build-prebuilts.sh to soong_uiandroid-o-iot-preview-5o-iot-preview-5
Test: prebuilts/build-tools/build-prebuilts.sh
Change-Id: If9392fe8ac0eae061b46d61ec8f4a1a0ae60da77
| -rwxr-xr-x | build-prebuilts.sh | 5 |
1 files changed, 2 insertions, 3 deletions
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 @@ if [ -n ${build_soong} ]; then "HostSecondaryArch":"x86" } EOF - BUILDDIR=${SOONG_OUT} ./bootstrap.bash SOONG_BINARIES=( acp bpfmt @@ -56,7 +55,7 @@ EOF 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 } 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/ |