commit 01f1ff2440759e34197f741a7b380a71c607f513
author Dan Albert <danalbert@google.com> Fri Nov 14 19:58:26 2014 -0800
committer Dan Albert <danalbert@google.com> Fri Nov 14 20:00:06 2014 -0800
tree bd64b3933689caab810ca31ea0022257c8a8531a
parent 27fa71ebc6ef63ed8020d7b040640cb6c0cf2a45

Allow asan for glibc tests.

SANITIZE_HOST will break if we don't allow ASAN.

Change-Id: I0beed82b058db391f633e0ea1098f140497c65d4

tests/Android.build.mk

diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index 9c5df0e..0754a7b 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -35,7 +35,10 @@
 endif
 
 LOCAL_CLANG := $($(module)_clang_$(build_type))
+
+ifneq ($($(module)_allow_asan),true)
 LOCAL_ADDRESS_SANITIZER := false
+endif
 
 LOCAL_FORCE_STATIC_EXECUTABLE := $($(module)_force_static_executable)
 

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 14a5e83..2a34ea9 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -316,6 +316,8 @@
 bionic-unit-tests-glibc_cppflags := $(test_cppflags)
 bionic-unit-tests-glibc_ldflags := -Wl,--export-dynamic
 
+bionic-unit-tests-glibc_allow_asan := true
+
 module := bionic-unit-tests-glibc
 module_tag := optional
 build_type := host