From 944fc40eda7d5e8a680b8af12ee8f615ccf18fbd Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 16 Jun 2015 14:14:43 -0700 Subject: [PATCH] Stop disallowing sanitizers. Change-Id: I641cb3fe998184f8926324e3365a7a99d87263df --- libs/host/Android.mk | 3 +-- tools/acp/Android.mk | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/host/Android.mk b/libs/host/Android.mk index cab878b406..d1d2e55c62 100644 --- a/libs/host/Android.mk +++ b/libs/host/Android.mk @@ -16,13 +16,12 @@ endif 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. diff --git a/tools/acp/Android.mk b/tools/acp/Android.mk index 2b41bc1bb4..fbdb7970ef 100644 --- a/tools/acp/Android.mk +++ b/tools/acp/Android.mk @@ -23,6 +23,5 @@ 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)