commit eef1eb64bb5be68bfb00f8e71d3118a2cfec99e7
author Dan Albert <danalbert@google.com> Sat Nov 15 06:47:07 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 15 06:47:08 2014 +0000
tree acd39b39d2b13bbe0c7c8fc1c71d53aa93167e24
parent 38569312bc5a3a4688d45997d81b59abb0a60825
parent 01f1ff2440759e34197f741a7b380a71c607f513

Merge "Allow asan for glibc tests."

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 967ddbd..92d7976 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -317,6 +317,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