commit ce915d950aaea86e566c8aec06be181a65c17cf2
author Dan Albert <danalbert@google.com> Mon Nov 03 17:36:13 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 03 17:36:14 2014 +0000
tree 0d52027dceba4f439a6cba0f9cd9869820ce1c25
parent bd0e8af734d5b6e28e2710bf53beb1b674e3fdb2
parent 7909ea9922b211832a7ed149c1c9e4ca52f914f5

Merge "Never use ASAN for acp."

libs/host/Android.mk

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 @@
 # acp to install libhost.
 LOCAL_ACP_UNAVAILABLE:= true
 
+LOCAL_ADDRESS_SANITIZER := false
+
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # Include toolchain prebuilt modules if they exist.

tools/acp/Android.mk

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_MODULE := acp
 LOCAL_ACP_UNAVAILABLE := true
 LOCAL_CXX_STL := none
+LOCAL_ADDRESS_SANITIZER := false
 
 include $(BUILD_HOST_EXECUTABLE)