diff --git a/libc/Android.mk b/libc/Android.mk index d5a57c342..5ac0e1d82 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -646,7 +646,7 @@ ifeq ($(strip $(DEBUG_BIONIC_LIBC)),true) 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 @@ -1207,7 +1207,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ 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 @@ -1344,7 +1344,7 @@ LOCAL_CLANG := $(use_clang) 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 @@ -1410,7 +1410,7 @@ LOCAL_PACK_MODULE_RELOCATIONS := false 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 bb3cc9d57..0e8433145 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -40,7 +40,7 @@ test_cflags = \ 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_src_files := \ libBionicStandardTests_cflags := \ $(test_cflags) \ -ifeq ($(MALLOC_IMPL),dlmalloc) +ifeq ($(MALLOC_SVELTE),true) libBionicStandardTests_cflags += -DUSE_DLMALLOC else libBionicStandardTests_cflags += -DUSE_JEMALLOC