diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-31 16:30:26 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-10-31 16:33:08 -0700 |
| commit | 7909ea9922b211832a7ed149c1c9e4ca52f914f5 (patch) | |
| tree | 6ae624b4357c2e1db59d2069c7868075a2a58ea2 | |
| parent | dfa2f8a6e309bca516a11d83abd1aa8733acce69 (diff) | |
| download | build-7909ea9922b211832a7ed149c1c9e4ca52f914f5.zip build-7909ea9922b211832a7ed149c1c9e4ca52f914f5.tar.gz build-7909ea9922b211832a7ed149c1c9e4ca52f914f5.tar.bz2 | |
Never use ASAN for acp.
Since acp is needed to build the ASAN libs, we can't use ASAN to
instrument it. Since libhost is included statically in acp, we can't
instrument that either.
Change-Id: Idb389df945380b6ef447fc3d3ead8be27ec09011
| -rw-r--r-- | libs/host/Android.mk | 3 | ||||
| -rw-r--r-- | tools/acp/Android.mk | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libs/host/Android.mk b/libs/host/Android.mk index c67afbb..cab878b 100644 --- a/libs/host/Android.mk +++ b/libs/host/Android.mk @@ -1,5 +1,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SRC_FILES:= \ CopyFile.c @@ -20,6 +21,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include # acp to install libhost. LOCAL_ACP_UNAVAILABLE:= true +LOCAL_ADDRESS_SANITIZER := false + include $(BUILD_HOST_STATIC_LIBRARY) # Include toolchain prebuilt modules if they exist. diff --git a/tools/acp/Android.mk b/tools/acp/Android.mk index e819e0c..2b41bc1 100644 --- a/tools/acp/Android.mk +++ b/tools/acp/Android.mk @@ -4,6 +4,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SRC_FILES := \ acp.c @@ -22,5 +23,6 @@ LOCAL_C_INCLUDES := build/libs/host/include LOCAL_MODULE := acp LOCAL_ACP_UNAVAILABLE := true LOCAL_CXX_STL := none +LOCAL_ADDRESS_SANITIZER := false include $(BUILD_HOST_EXECUTABLE) |