Merge "Move jemalloc due to whole_static_library bug."

2014-06-17 00:49:49 +00:00 · 2014-06-17 00:49:49 +00:00 · d10d3acd45
commit d10d3acd45
parent a217a0cdb3 3a37576d4b
2 changed files with 1 additions and 1 deletions
--- a/libc/Android.mk
+++ b/libc/Android.mk
@ -501,7 +501,7 @@ endif

 ifeq ($(MALLOC_IMPL),jemalloc)
  libc_common_cflags += -DUSE_JEMALLOC
-  libc_malloc_src := bionic/jemalloc.cpp
+  libc_malloc_src := bionic/jemalloc_wrapper.cpp
 else
  libc_common_cflags += -DUSE_DLMALLOC
  libc_malloc_src := bionic/dlmalloc.c
--- a/libc/bionic/jemalloc_wrapper.cpp
+++ b/libc/bionic/jemalloc_wrapper.cpp