From 7909ea9922b211832a7ed149c1c9e4ca52f914f5 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 31 Oct 2014 16:30:26 -0700 Subject: [PATCH] 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 --- libs/host/Android.mk | 3 +++ tools/acp/Android.mk | 2 ++ 2 files changed, 5 insertions(+) diff --git a/libs/host/Android.mk b/libs/host/Android.mk index c67afbbcd9..cab878b406 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 e819e0c630..2b41bc1bb4 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)