commit 8e32b7b3543eadbb58a92443fb57d60aac92ef88
author Christopher Ferris <cferris@google.com> Thu Jul 10 18:53:41 2014 -0700
committer Christopher Ferris <cferris@google.com> Fri Jul 11 11:01:30 2014 -0700
tree 1020766b7e8d6f930fa671174dbd733b9e810f7c
parent c6bc001776931fd1c8583df2b8948dcb8bf61007

Make jemalloc the default choice.

Change-Id: I5ff0cf0c396b7ae6278e6fcd5a0d50f8b966fb54

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 278511b..3e8fbe6 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -40,7 +40,9 @@
 
 test_cflags += -D__STDC_LIMIT_MACROS  # For glibc.
 
-ifeq ($(MALLOC_IMPL),jemalloc)
+ifeq ($(MALLOC_IMPL),dlmalloc)
+test_cflags += -DUSE_DLMALLOC
+else
 test_cflags += -DUSE_JEMALLOC
 endif
 
@@ -115,10 +117,10 @@
 libBionicStandardTests_cflags := \
     $(test_cflags) \
 
-ifeq ($(MALLOC_IMPL),jemalloc)
-  libBionicStandardTests_cflags += -DUSE_JEMALLOC
-else
+ifeq ($(MALLOC_IMPL),dlmalloc)
   libBionicStandardTests_cflags += -DUSE_DLMALLOC
+else
+  libBionicStandardTests_cflags += -DUSE_JEMALLOC
 endif
 
 libBionicStandardTests_cppflags := \