From 01f1ff2440759e34197f741a7b380a71c607f513 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Fri, 14 Nov 2014 19:58:26 -0800
Subject: [PATCH] Allow asan for glibc tests.

SANITIZE_HOST will break if we don't allow ASAN.

Change-Id: I0beed82b058db391f633e0ea1098f140497c65d4
---
 tests/Android.build.mk | 3 +++
 tests/Android.mk       | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index 9c5df0e51..0754a7bf9 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -35,7 +35,10 @@ endif
 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)
 
diff --git a/tests/Android.mk b/tests/Android.mk
index 14a5e8331..2a34ea998 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -316,6 +316,8 @@ bionic-unit-tests-glibc_cflags := $(test_cflags)
 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