Update update.sh to copy in ASAN prebuilts.
Change-Id: Id65783a5df292d69c3281e5f5a98e1709a616c7a
diff --git a/update.sh b/update.sh
index 204a08e..6fb8fc4 100755
--- a/update.sh
+++ b/update.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
# Copy binaries
for b in bin/*; do
@@ -24,6 +24,9 @@
cp -a $i lib/clang/*/include/
done
+echo Copying sanitizer headers
+cp -a ${ANDROID_BUILD_TOP}/external/compiler-rt/include/sanitizer lib/clang/*/include/
+
# Copy over stdatomic.h from bionic
echo Copying stdatomic.h
cp -a ${ANDROID_BUILD_TOP}/bionic/libc/include/stdatomic.h lib/clang/*/include/
@@ -31,3 +34,14 @@
echo Copying arm_neon.h
cp -a `find ${ANDROID_PRODUCT_OUT} -name arm_neon.h` lib/clang/*/include
+echo Copying ASan libraries
+LIBS=$(echo lib/clang/*)/lib/linux
+cp -a ${ANDROID_HOST_OUT}/obj/STATIC_LIBRARIES/libasan_intermediates/libasan.a \
+ ${LIBS}/libclang_rt.asan-x86_64.a
+cp -a ${ANDROID_HOST_OUT}/obj/STATIC_LIBRARIES/libasan_cxx_intermediates/libasan_cxx64.a \
+ ${LIBS}/libclang_rt.asan_cxx-x86_64.a
+cp -a ${ANDROID_HOST_OUT}/obj32/STATIC_LIBRARIES/libasan_intermediates/libasan.a \
+ ${LIBS}/libclang_rt.asan-i386.a
+cp -a ${ANDROID_HOST_OUT}/obj32/STATIC_LIBRARIES/libasan_cxx_intermediates/libasan_cxx32.a \
+ ${LIBS}/libclang_rt.asan_cxx-i386.a
+
