commit 9dd5ab46194a3ef7992b0c08d18f2e30551f9331
author Dan Albert <danalbert@google.com> Thu Dec 18 16:07:14 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 18 16:07:15 2014 +0000
tree 1ce831ed3c79c77299e93aa1f21370c20b9f2ba0
parent 370a3e573d1cdff6070c77322d4a07bd53e5db3c
parent da194780b1ae4487aa630bef4e720694acf4da82

Merge "Disable ASAN for more of our libraries."

libdl/Android.mk

diff --git a/libdl/Android.mk b/libdl/Android.mk
index c9fca0e..2a0724a 100644
--- a/libdl/Android.mk
+++ b/libdl/Android.mk
@@ -36,6 +36,7 @@
 LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
 
+LOCAL_ADDRESS_SANITIZER := false
 include $(BUILD_SHARED_LIBRARY)
 
 # A dummy libdl.a. Need for static executables using the LLVM unwinder. Most
@@ -48,4 +49,5 @@
 
 LOCAL_MODULE := libdl
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_ADDRESS_SANITIZER := false
 include $(BUILD_STATIC_LIBRARY)

libm/Android.mk

diff --git a/libm/Android.mk b/libm/Android.mk
index d4cd7c3..cc2b8be 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -285,6 +285,7 @@
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc
 
 LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
+LOCAL_ADDRESS_SANITIZER := false
 
 # arch-specific settings
 LOCAL_C_INCLUDES_arm := $(LOCAL_PATH)/arm
@@ -321,6 +322,7 @@
 LOCAL_WHOLE_STATIC_LIBRARIES := libm
 
 LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
+LOCAL_ADDRESS_SANITIZER := false
 
 LOCAL_CXX_STL := none