commit 944fc40eda7d5e8a680b8af12ee8f615ccf18fbd
author Dan Albert <danalbert@google.com> Tue Jun 16 14:14:43 2015 -0700
committer Dan Albert <danalbert@google.com> Tue Jun 16 22:20:19 2015 -0700
tree 73a0383a4348517c3daa6f28257f42b34edf7495
parent 8ae7aa942bf7d0844bcdfb6116076a21837ded4c

Stop disallowing sanitizers.

Change-Id: I641cb3fe998184f8926324e3365a7a99d87263df

libs/host/Android.mk

diff --git a/libs/host/Android.mk b/libs/host/Android.mk
index cab878b..d1d2e55 100644
--- a/libs/host/Android.mk
+++ b/libs/host/Android.mk
@@ -16,13 +16,12 @@
 
 LOCAL_MODULE:= libhost
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_CXX_STL := none
 
 # acp uses libhost, so we can't use
 # 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 2b41bc1..fbdb797 100644
--- a/tools/acp/Android.mk
+++ b/tools/acp/Android.mk
@@ -23,6 +23,5 @@
 LOCAL_MODULE := acp
 LOCAL_ACP_UNAVAILABLE := true
 LOCAL_CXX_STL := none
-LOCAL_ADDRESS_SANITIZER := false
 
 include $(BUILD_HOST_EXECUTABLE)