aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert2014-12-18 10:07:14 -0600
committerGerrit Code Review2014-12-18 10:07:15 -0600
commit9dd5ab46194a3ef7992b0c08d18f2e30551f9331 (patch)
tree1ce831ed3c79c77299e93aa1f21370c20b9f2ba0
parent370a3e573d1cdff6070c77322d4a07bd53e5db3c (diff)
parentda194780b1ae4487aa630bef4e720694acf4da82 (diff)
downloadplatform-bionic-9dd5ab46194a3ef7992b0c08d18f2e30551f9331.tar.gz
platform-bionic-9dd5ab46194a3ef7992b0c08d18f2e30551f9331.tar.xz
platform-bionic-9dd5ab46194a3ef7992b0c08d18f2e30551f9331.zip
Merge "Disable ASAN for more of our libraries."
-rw-r--r--libdl/Android.mk2
-rw-r--r--libm/Android.mk2
2 files changed, 4 insertions, 0 deletions
diff --git a/libdl/Android.mk b/libdl/Android.mk
index c9fca0e7..2a0724a0 100644
--- a/libdl/Android.mk
+++ b/libdl/Android.mk
@@ -36,6 +36,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
36LOCAL_ALLOW_UNDEFINED_SYMBOLS := true 36LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
37LOCAL_SYSTEM_SHARED_LIBRARIES := 37LOCAL_SYSTEM_SHARED_LIBRARIES :=
38 38
39LOCAL_ADDRESS_SANITIZER := false
39include $(BUILD_SHARED_LIBRARY) 40include $(BUILD_SHARED_LIBRARY)
40 41
41# A dummy libdl.a. Need for static executables using the LLVM unwinder. Most 42# A dummy libdl.a. Need for static executables using the LLVM unwinder. Most
@@ -48,4 +49,5 @@ LOCAL_CXX_STL := none
48 49
49LOCAL_MODULE := libdl 50LOCAL_MODULE := libdl
50LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk 51LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
52LOCAL_ADDRESS_SANITIZER := false
51include $(BUILD_STATIC_LIBRARY) 53include $(BUILD_STATIC_LIBRARY)
diff --git a/libm/Android.mk b/libm/Android.mk
index d4cd7c3e..cc2b8be0 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -285,6 +285,7 @@ LOCAL_SRC_FILES := $(libm_common_src_files)
285LOCAL_SYSTEM_SHARED_LIBRARIES := libc 285LOCAL_SYSTEM_SHARED_LIBRARIES := libc
286 286
287LOCAL_NATIVE_COVERAGE := $(bionic_coverage) 287LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
288LOCAL_ADDRESS_SANITIZER := false
288 289
289# arch-specific settings 290# arch-specific settings
290LOCAL_C_INCLUDES_arm := $(LOCAL_PATH)/arm 291LOCAL_C_INCLUDES_arm := $(LOCAL_PATH)/arm
@@ -321,6 +322,7 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := libc
321LOCAL_WHOLE_STATIC_LIBRARIES := libm 322LOCAL_WHOLE_STATIC_LIBRARIES := libm
322 323
323LOCAL_NATIVE_COVERAGE := $(bionic_coverage) 324LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
325LOCAL_ADDRESS_SANITIZER := false
324 326
325LOCAL_CXX_STL := none 327LOCAL_CXX_STL := none
326 328