generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace MALLOC_IMPL with MALLOC_SVELTE.

Browse Source 
Bug: http://b/26390299
Change-Id: I665f64bff4d598607e1eb7c4078819fe1d400feb
This commit is contained in:
Josh Gao 2016-01-05 11:45:45 -08:00
parent 04673ee997
commit 09f4651c0e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libc/Android.mk
View File

@ -645,7 +645,7 @@ ifeq ($(strip $(DEBUG_BIONIC_LIBC)),true)
libc_common_cflags += -DDEBUG libc_common_cflags += -DDEBUG
endif endif
ifeq ($(MALLOC_IMPL),dlmalloc) ifeq ($(MALLOC_SVELTE),true)
libc_common_cflags += -DUSE_DLMALLOC libc_common_cflags += -DUSE_DLMALLOC
libc_malloc_src := bionic/dlmalloc.c libc_malloc_src := bionic/dlmalloc.c
else else
@ -1206,7 +1206,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
LOCAL_WHOLE_STATIC_LIBRARIES_arm := libc_aeabi LOCAL_WHOLE_STATIC_LIBRARIES_arm := libc_aeabi
LOCAL_CXX_STL := none LOCAL_CXX_STL := none
ifneq ($(MALLOC_IMPL),dlmalloc) ifneq ($(MALLOC_SVELTE),true)
LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc
endif endif
@ -1343,7 +1343,7 @@ LOCAL_CLANG := $(use_clang)
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
LOCAL_WHOLE_STATIC_LIBRARIES := libc_common LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
ifneq ($(MALLOC_IMPL),dlmalloc) ifneq ($(MALLOC_SVELTE),true)
LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc
endif endif
@ -1409,7 +1409,7 @@ LOCAL_PACK_MODULE_RELOCATIONS := false
LOCAL_SHARED_LIBRARIES := libdl LOCAL_SHARED_LIBRARIES := libdl
LOCAL_WHOLE_STATIC_LIBRARIES := libc_common LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
ifneq ($(MALLOC_IMPL),dlmalloc) ifneq ($(MALLOC_SVELTE),true)
LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc
endif endif

4
tests/Android.mk
View File

@ -40,7 +40,7 @@ test_cflags = \
test_cflags += -D__STDC_LIMIT_MACROS # For glibc. test_cflags += -D__STDC_LIMIT_MACROS # For glibc.
ifeq ($(MALLOC_IMPL),dlmalloc) ifeq ($(MALLOC_SVELTE),true)
test_cflags += -DUSE_DLMALLOC test_cflags += -DUSE_DLMALLOC
else else
test_cflags += -DUSE_JEMALLOC test_cflags += -DUSE_JEMALLOC
@ -122,7 +122,7 @@ libBionicStandardTests_src_files := \
libBionicStandardTests_cflags := \ libBionicStandardTests_cflags := \
$(test_cflags) \ $(test_cflags) \
ifeq ($(MALLOC_IMPL),dlmalloc) ifeq ($(MALLOC_SVELTE),true)
libBionicStandardTests_cflags += -DUSE_DLMALLOC libBionicStandardTests_cflags += -DUSE_DLMALLOC
else else
libBionicStandardTests_cflags += -DUSE_JEMALLOC libBionicStandardTests_cflags += -DUSE_JEMALLOC