commit 131e23904e7411f606f0b1d52698792ec17fdcae
author Dan Willemsen <dwillemsen@google.com> Thu Oct 06 22:17:55 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 06 22:17:55 2016 +0000
tree 4c6deb7f44a09799a324ba30136f1d620ec9b4bf
parent add0694f7957804b78403d893deeb6d6aa27b392
parent 65a36174ea3e0f487fc5ac7846966b8386fdb2f8

Add ASAN prebuilt generation am: 6adbc36d2f am: 5d84a345fd
am: 65a36174ea

Change-Id: I0226eb0846ebbc1467778ff8c015569eb683f013

build-prebuilts.sh

diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index 96deb5d..bd9b387 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -41,11 +41,33 @@
     BUILDDIR=${SOONG_OUT} ./bootstrap.bash
     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 ${SOONG_BINARIES[@]/#/bin/} lib*/
-    )
     ${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/
+    cp -R ${SOONG_HOST_OUT}/lib* ${SOONG_OUT}/dist/
+
+    if [[ $OS == "linux" ]]; then
+        # Build ASAN versions
+        export ASAN_OPTIONS=detect_leaks=0
+        cat > ${SOONG_OUT}/soong.variables << EOF
+{
+    "Allow_missing_dependencies": true,
+    "HostArch":"x86_64",
+    "HostSecondaryArch":"x86",
+    "SanitizeHost": ["address"]
+}
+EOF
+        ${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/asan/bin
+        cp ${SOONG_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/} ${SOONG_OUT}/dist/asan/bin/
+        cp -R ${SOONG_HOST_OUT}/lib* ${SOONG_OUT}/dist/asan/
+    fi
+
+    (
+        cd ${SOONG_OUT}/dist
+        zip -qryX build-prebuilts.zip *
+    )
 fi
 
 # Go
@@ -72,8 +94,8 @@
     mkdir -p ${DIST_DIR} || true
 
     if [ -n ${build_soong} ]; then
-        cp ${SOONG_HOST_OUT}/build-prebuilts.zip ${DIST_DIR}/
-	cp ${SOONG_OUT}/.bootstrap/docs/soong_build.html ${DIST_DIR}/
+        cp ${SOONG_OUT}/dist/build-prebuilts.zip ${DIST_DIR}/
+        cp ${SOONG_OUT}/.bootstrap/docs/soong_build.html ${DIST_DIR}/
     fi
     if [ -n ${build_go} ]; then
         cp ${GO_OUT}/go.zip ${DIST_DIR}/