commit 3a37576d4b9714989b0618f6d1a2d2b2df77ed2b
author Christopher Ferris <cferris@google.com> Mon Jun 16 17:13:09 2014 -0700
committer Christopher Ferris <cferris@google.com> Mon Jun 16 17:13:09 2014 -0700
tree 370a3ae262e4903148029b726b6200a86ab1cde8
parent a217a0cdb3ff78f6b59d64fd4356f87643ad9d1e

Move jemalloc due to whole_static_library bug.

Rename jemalloc.cpp to jemalloc_wrapper.cpp to avoid problems with
the libc library having two jemalloc.o files that clobber each other.

Change-Id: I9a2d966dbf414b1367ee0ef1f0d73fca6f25b518

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index bc6cf78..2747a3e 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -501,7 +501,7 @@
 
 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