| commit | fc35de0a04eccc4134ea14e1fbe1c9efad79bcc0 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Thu Jul 10 18:53:22 2014 -0700 |
| committer | Christopher Ferris <cferris@google.com> | Fri Jul 11 11:00:43 2014 -0700 |
| tree | c2c701585e278ec13c73d7f75436c01fb7948fa1 | |
| parent | 3641ac7de8b51c0853eaaa2ba3a3ab7e65a837c5 [diff] [blame] |
Make jemalloc the default choice. Change-Id: Iadf29d28758bc17904098b4eeb9bc14a0a51299e
diff --git a/runtime/Android.mk b/runtime/Android.mk index 7f5cf0c..b0c1a9c 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk
@@ -309,10 +309,10 @@ LIBART_CFLAGS += -DART_USE_PORTABLE_COMPILER=1 endif -ifeq ($(MALLOC_IMPL),jemalloc) - LIBART_CFLAGS += -DUSE_JEMALLOC -else +ifeq ($(MALLOC_IMPL),dlmalloc) LIBART_CFLAGS += -DUSE_DLMALLOC +else + LIBART_CFLAGS += -DUSE_JEMALLOC endif # $(1): target or host