commit 360fad799cdd674469309907a015300a65fb1f30
author Dan Willemsen <dwillemsen@google.com> Fri Oct 21 21:18:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 21 21:18:01 2016 +0000
tree adadc7b0a0d0ba65d283c8e26137dc5d54960ffb
parent 16b96955af160df7fcd3fc4b472d83098be12615
parent cf5a5028453646904b9c0b2549fec5129e56d109

Start building prebuilts for bpfmt and ckati_stamp_dump
am: cf5a502845

Change-Id: Ibc7747ffb1718bfbff85d28787d3d38794ef2a65

build-prebuilts.sh

diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index bd9b387..f70b699 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -39,7 +39,7 @@
 }
 EOF
     BUILDDIR=${SOONG_OUT} ./bootstrap.bash
-    SOONG_BINARIES=( acp ckati ijar makeparallel ninja ziptime )
+    SOONG_BINARIES=( acp bpfmt ckati ckati_stamp_dump 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
     mkdir -p ${SOONG_OUT}/dist/bin
@@ -49,6 +49,8 @@
     if [[ $OS == "linux" ]]; then
         # Build ASAN versions
         export ASAN_OPTIONS=detect_leaks=0
+        # Remove Go binaries that won't change with ASAN
+        SOONG_BINARIES=( ${SOONG_BINARIES[@]/bpfmt} )
         cat > ${SOONG_OUT}/soong.variables << EOF
 {
     "Allow_missing_dependencies": true,