Update ASAN prebuilts.
Need to add the asan_cxx prebuilts to match
https://android-review.googlesource.com/#/c/113352/
The 32-bit libraries are now name i686 instead of i386.
Change-Id: Icf6f1dc84324a165c19de9ad135382c9518f54ee
diff --git a/lib/clang/3.6/lib/linux/libclang_rt.asan-i386.a b/lib/clang/3.6/lib/linux/libclang_rt.asan-i686.a
similarity index 80%
rename from lib/clang/3.6/lib/linux/libclang_rt.asan-i386.a
rename to lib/clang/3.6/lib/linux/libclang_rt.asan-i686.a
index 12bf772..7e5a3cf 100644
--- a/lib/clang/3.6/lib/linux/libclang_rt.asan-i386.a
+++ b/lib/clang/3.6/lib/linux/libclang_rt.asan-i686.a
Binary files differ
diff --git a/lib/clang/3.6/lib/linux/libclang_rt.asan-x86_64.a b/lib/clang/3.6/lib/linux/libclang_rt.asan-x86_64.a
index c8e1f86..20e40c9 100644
--- a/lib/clang/3.6/lib/linux/libclang_rt.asan-x86_64.a
+++ b/lib/clang/3.6/lib/linux/libclang_rt.asan-x86_64.a
Binary files differ
diff --git a/lib/clang/3.6/lib/linux/libclang_rt.asan_cxx-i686.a b/lib/clang/3.6/lib/linux/libclang_rt.asan_cxx-i686.a
new file mode 100644
index 0000000..8f00f0a
--- /dev/null
+++ b/lib/clang/3.6/lib/linux/libclang_rt.asan_cxx-i686.a
Binary files differ
diff --git a/lib/clang/3.6/lib/linux/libclang_rt.asan_cxx-x86_64.a b/lib/clang/3.6/lib/linux/libclang_rt.asan_cxx-x86_64.a
new file mode 100644
index 0000000..94eb54d
--- /dev/null
+++ b/lib/clang/3.6/lib/linux/libclang_rt.asan_cxx-x86_64.a
Binary files differ
diff --git a/update.sh b/update.sh
index 60c107c..a2a9a32 100755
--- a/update.sh
+++ b/update.sh
@@ -39,6 +39,9 @@
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
-
+ ${LIBS}/libclang_rt.asan-i686.a
+cp -a ${ANDROID_HOST_OUT}/obj32/STATIC_LIBRARIES/libasan_cxx_intermediates/libasan_cxx32.a \
+ ${LIBS}/libclang_rt.asan_cxx-i686.a