summaryrefslogtreecommitdiffstats
path: root/vm
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-07-12 08:07:28 -0700
committerChristopher Ferris <cferris@google.com>2014-07-12 08:07:28 -0700
commit413f5b2f4e87e48115e321587a1d2b1117563475 (patch)
treea4158123ee8ffe1f405c4e61ef83f93cbc57d07a /vm
parent8cd32877c9d616bb44020c02008a724d4d219a55 (diff)
downloadandroid_dalvik-413f5b2f4e87e48115e321587a1d2b1117563475.tar.gz
android_dalvik-413f5b2f4e87e48115e321587a1d2b1117563475.tar.bz2
android_dalvik-413f5b2f4e87e48115e321587a1d2b1117563475.zip
Switch defaults of dlmalloc/jemalloc.
Change-Id: Ic24de231aea0f4ea49ea51572a839639dc7fb79b
Diffstat (limited to 'vm')
-rw-r--r--vm/Dvm.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/vm/Dvm.mk b/vm/Dvm.mk
index 67bd5a31f..6782751d2 100644
--- a/vm/Dvm.mk
+++ b/vm/Dvm.mk
@@ -34,10 +34,10 @@ ifneq ($(strip $(LOCAL_CLANG)),true)
LOCAL_CFLAGS += -fno-align-jumps
endif
-ifeq ($(MALLOC_IMPL),jemalloc)
-LOCAL_CFLAGS += -DUSE_JEMALLOC
-else
+ifeq ($(MALLOC_IMPL),dlmalloc)
LOCAL_CFLAGS += -DUSE_DLMALLOC
+else
+LOCAL_CFLAGS += -DUSE_JEMALLOC
endif
#