commit b656410a73c4dfa2a3f8deba0a673080320f8605
author Christopher Ferris <cferris@google.com> Tue Jun 17 18:21:30 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 17 04:51:41 2014 +0000
tree e4b34e6e1b1d2c8e182e5afa18651870779b5665
parent d10d3acd45d045e5a705d22c2297483765e40f5f
parent 636196438180fd37027bf7b7119a436169b6923e

Merge "Use a separate config.h for config like defines."

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

libc/bionic/jemalloc_wrapper.cpp

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