From da194780b1ae4487aa630bef4e720694acf4da82 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 18 Dec 2014 08:03:49 -0800 Subject: [PATCH] Disable ASAN for more of our libraries. Since ASAN depends on these libraries, we need to exclude them from being instrumented. Change-Id: I62005b6d04ee7b2283c4bd54ace5304386c67358 --- libdl/Android.mk | 2 ++ libm/Android.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libdl/Android.mk b/libdl/Android.mk index c9fca0e7f..2a0724a0b 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 d4cd7c3e8..cc2b8be0a 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