Merge "Replace MALLOC_IMPL with MALLOC_SVELTE." am: e1f8c66d0b
am: 8e3cc4179b
* commit '8e3cc4179bc1130cdcb940466602a89ceb9c0327':
Replace MALLOC_IMPL with MALLOC_SVELTE.
diff --git a/libc/Android.mk b/libc/Android.mk
index 83e1fb5..6e5ae62 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -645,7 +645,7 @@
libc_common_cflags += -DDEBUG
endif
-ifeq ($(MALLOC_IMPL),dlmalloc)
+ifeq ($(MALLOC_SVELTE),true)
libc_common_cflags += -DUSE_DLMALLOC
libc_malloc_src := bionic/dlmalloc.c
else
@@ -1206,7 +1206,7 @@
LOCAL_WHOLE_STATIC_LIBRARIES_arm := libc_aeabi
LOCAL_CXX_STL := none
-ifneq ($(MALLOC_IMPL),dlmalloc)
+ifneq ($(MALLOC_SVELTE),true)
LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc
endif
@@ -1343,7 +1343,7 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
-ifneq ($(MALLOC_IMPL),dlmalloc)
+ifneq ($(MALLOC_SVELTE),true)
LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc
endif
@@ -1409,7 +1409,7 @@
LOCAL_SHARED_LIBRARIES := libdl
LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
-ifneq ($(MALLOC_IMPL),dlmalloc)
+ifneq ($(MALLOC_SVELTE),true)
LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc
endif
diff --git a/tests/Android.mk b/tests/Android.mk
index bb3cc9d..0e84331 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -40,7 +40,7 @@
test_cflags += -D__STDC_LIMIT_MACROS # For glibc.
-ifeq ($(MALLOC_IMPL),dlmalloc)
+ifeq ($(MALLOC_SVELTE),true)
test_cflags += -DUSE_DLMALLOC
else
test_cflags += -DUSE_JEMALLOC
@@ -122,7 +122,7 @@
libBionicStandardTests_cflags := \
$(test_cflags) \
-ifeq ($(MALLOC_IMPL),dlmalloc)
+ifeq ($(MALLOC_SVELTE),true)
libBionicStandardTests_cflags += -DUSE_DLMALLOC
else
libBionicStandardTests_cflags += -DUSE_JEMALLOC