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

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 5acdd6b..765f4d2 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -515,12 +515,13 @@
   libc_common_cflags += -DDEBUG
 endif
 
-ifeq ($(MALLOC_IMPL),jemalloc)
-  libc_common_cflags += -DUSE_JEMALLOC
-  libc_malloc_src := bionic/jemalloc_wrapper.cpp
-else
+ifeq ($(MALLOC_IMPL),dlmalloc)
   libc_common_cflags += -DUSE_DLMALLOC
   libc_malloc_src := bionic/dlmalloc.c
+else
+  libc_common_cflags += -DUSE_JEMALLOC
+  libc_malloc_src := bionic/jemalloc_wrapper.cpp
+  libc_common_c_includes += external/jemalloc/include
 endif
 
 # To customize dlmalloc's alignment, set BOARD_MALLOC_ALIGNMENT in
@@ -547,14 +548,10 @@
 
 # Define some common includes
 # ========================================================
-libc_common_c_includes := \
+libc_common_c_includes += \
     $(LOCAL_PATH)/stdlib  \
     $(LOCAL_PATH)/stdio   \
 
-ifeq ($(MALLOC_IMPL),jemalloc)
-  libc_common_c_includes += external/jemalloc/include
-endif
-
 # ========================================================
 # Add in the arch-specific flags.
 # Must be called with $(eval).
@@ -873,7 +870,7 @@
 
 LOCAL_WHOLE_STATIC_LIBRARIES_arm := libc_aeabi
 
-ifeq ($(MALLOC_IMPL),jemalloc)
+ifneq ($(MALLOC_IMPL),dlmalloc)
 LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc
 endif