diff options
| author | Dan Albert <danalbert@google.com> | 2014-12-18 16:07:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-18 16:07:15 +0000 |
| commit | 9dd5ab46194a3ef7992b0c08d18f2e30551f9331 (patch) | |
| tree | 1ce831ed3c79c77299e93aa1f21370c20b9f2ba0 | |
| parent | 370a3e573d1cdff6070c77322d4a07bd53e5db3c (diff) | |
| parent | da194780b1ae4487aa630bef4e720694acf4da82 (diff) | |
| download | bionic-9dd5ab46194a3ef7992b0c08d18f2e30551f9331.zip bionic-9dd5ab46194a3ef7992b0c08d18f2e30551f9331.tar.gz bionic-9dd5ab46194a3ef7992b0c08d18f2e30551f9331.tar.bz2 | |
Merge "Disable ASAN for more of our libraries."
| -rw-r--r-- | libdl/Android.mk | 2 | ||||
| -rw-r--r-- | libm/Android.mk | 2 |
2 files changed, 4 insertions, 0 deletions
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_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk 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_CXX_STL := none LOCAL_MODULE := libdl LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_ADDRESS_SANITIZER := false include $(BUILD_STATIC_LIBRARY) 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_SRC_FILES := $(libm_common_src_files) 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_SYSTEM_SHARED_LIBRARIES := libc LOCAL_WHOLE_STATIC_LIBRARIES := libm LOCAL_NATIVE_COVERAGE := $(bionic_coverage) +LOCAL_ADDRESS_SANITIZER := false LOCAL_CXX_STL := none |