am 6589ba15: am d10d3acd: Merge "Move jemalloc due to whole_static_library bug."

* commit '6589ba1561fd97785a0eb5c2eb8cc7d41a5b83e1': Move jemalloc due to whole_static_library bug.
2014-06-17 01:47:47 +00:00 · 2014-06-17 01:47:47 +00:00 · c92354b66d
commit c92354b66d
parent c4978a5646 6589ba1561
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