summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-12-08 19:02:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-08 19:02:26 +0000
commita05d9231756400c065a27d169aac925100a1a0bb (patch)
treedb2cea7ec1eb6c90730e80c8916b2e3e20136ec2
parentd1c1b46483e2723b9bd8deaef95fd9cd9b927e45 (diff)
parent2958cc22ed5416ba7b404ab74cf4bd896c140e8e (diff)
download3.6-a05d9231756400c065a27d169aac925100a1a0bb.tar.gz
am 2958cc22: Update ASAN prebuilts.
* commit '2958cc22ed5416ba7b404ab74cf4bd896c140e8e': Update ASAN prebuilts.
-rw-r--r--lib/clang/3.6/lib/linux/libclang_rt.asan-i686.a (renamed from lib/clang/3.6/lib/linux/libclang_rt.asan-i386.a)bin5420574 -> 5350846 bytes
-rw-r--r--lib/clang/3.6/lib/linux/libclang_rt.asan-x86_64.abin8172698 -> 8097612 bytes
-rw-r--r--lib/clang/3.6/lib/linux/libclang_rt.asan_cxx-i686.abin0 -> 65406 bytes
-rw-r--r--lib/clang/3.6/lib/linux/libclang_rt.asan_cxx-x86_64.abin0 -> 70326 bytes
-rwxr-xr-xupdate.sh7
5 files changed, 5 insertions, 2 deletions
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
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 @@ 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
-
+ ${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