From 3a37576d4b9714989b0618f6d1a2d2b2df77ed2b Mon Sep 17 00:00:00 2001
From: Christopher Ferris <cferris@google.com>
Date: Mon, 16 Jun 2014 17:13:09 -0700
Subject: [PATCH] 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 | 2 +-
libc/bionic/{jemalloc.cpp => jemalloc_wrapper.cpp} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename libc/bionic/{jemalloc.cpp => jemalloc_wrapper.cpp} (100%)
diff --git a/libc/Android.mk b/libc/Android.mk
index bc6cf78f9..2747a3eab 100644
--- 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
diff --git a/libc/bionic/jemalloc.cpp b/libc/bionic/jemalloc_wrapper.cpp
similarity index 100%
rename from libc/bionic/jemalloc.cpp
rename to libc/bionic/jemalloc_wrapper.cpp