commit a7f893a5fc1b1c572b89d4bc5d52e5e2a33a2f5f
author Dan Albert <danalbert@google.com> Fri Oct 31 16:18:55 2014 -0700
committer Dan Albert <danalbert@google.com> Mon Nov 03 08:34:51 2014 -0800
tree bb983a893ff408986564ffaf38a50a0425fed28d
parent 345db5eaa81b8135cc03346b2e62ebd7f73e9f5d

Disable ASAN in more targets.

Explicitly disable ASAN for host ASAN targets. I had also missed one
of the builtin libs. Disable it for libprofile_rt as well.

Change-Id: If3935b1ceec81975e8963d8be7ea81c0a4df14b3

lib/asan/Android.mk

diff --git a/lib/asan/Android.mk b/lib/asan/Android.mk
index 02d8ecf..7402045 100644
--- a/lib/asan/Android.mk
+++ b/lib/asan/Android.mk
@@ -228,6 +228,7 @@
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CLANG := true
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_ADDRESS_SANITIZER := false
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -238,6 +239,7 @@
 LOCAL_CPPFLAGS := -std=c++11
 LOCAL_CXX_STL := libc++
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_ADDRESS_SANITIZER := false
 include $(BUILD_HOST_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -261,6 +263,7 @@
 LOCAL_CLANG := true
 LOCAL_CXX_STL := libc++
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_ADDRESS_SANITIZER := false
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)