commit e5fdaa4f9d102461a4d8a865e6ca84666893b9e7
author Dan Albert <danalbert@google.com> Sat Jun 14 01:04:31 2014 +0000
committer Dan Albert <danalbert@google.com> Sat Jun 14 01:04:31 2014 +0000
tree c17c2b67e2f12161e67f9b337c9cdc11bd8eab5f
parent a04d2bc28e7d7fcaf34ad71e4a6608a13cf84197

Revert "Backing this one out since the counterpart needs to be sent upstream."

This reverts commit a04d2bc28e7d7fcaf34ad71e4a6608a13cf84197.

Change-Id: I1b49165ca5d4bafdba7948818256a6167a363aca

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index c2e76b6..ce0c5f2 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -115,9 +115,18 @@
 libBionicStandardTests_cflags := \
     $(test_cflags) \
 
+ifeq ($(MALLOC_IMPL),jemalloc)
+  libBionicStandardTests_cflags += -DUSE_JEMALLOC
+else
+  libBionicStandardTests_cflags += -DUSE_DLMALLOC
+endif
+
 libBionicStandardTests_cppflags := \
     $(test_cppflags) \
 
+libBionicStandardTests_c_includes := \
+    bionic/libc \
+
 libBionicStandardTests_ldlibs_host := \
     -lrt \