commit 9447c6b21bb0aa684b5bea9f74f1277058743a04
author Dan Willemsen <dwillemsen@google.com> Fri Oct 12 00:37:49 2018 -0700
committer Dan Willemsen <dwillemsen@google.com> Mon Oct 22 19:29:10 2018 +0000
tree d9dfac14882e3092be431d7c1fe264df06f976ce
parent a517fc5366709135ec88172e12c44bd641ac7ebf

Fix settings for host bionic

Bug: 31559095
Test: attempt to build host bionic
Change-Id: I9e02fcd01f3f5c23fb4a64bd13d6b0a2fb2c1dbb

Android.bp

diff --git a/Android.bp b/Android.bp
index bc22a71..cea3a8d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -83,6 +83,9 @@
             ],
             product_variables: android_product_variables,
         },
+        linux_bionic: {
+            cflags: ["-DJEMALLOC_TCACHE"],
+        },
         linux_glibc: {
             enabled: true,
         },

include/jemalloc/internal/jemalloc_internal_defs.h

diff --git a/include/jemalloc/internal/jemalloc_internal_defs.h b/include/jemalloc/internal/jemalloc_internal_defs.h
index 9ffe26c..03d537e 100644
--- a/include/jemalloc/internal/jemalloc_internal_defs.h
+++ b/include/jemalloc/internal/jemalloc_internal_defs.h
@@ -1,4 +1,7 @@
-#if !defined(__ANDROID__)
+/* Include cdefs to see if __BIONIC__ is set */
+#include <sys/cdefs.h>
+
+#if !defined(__BIONIC__)
 #include "jemalloc_internal_defs_host.h"
 #else
 /* include/jemalloc/internal/jemalloc_internal_defs.h.  Generated from jemalloc_internal_defs.h.in by configure.  */

include/jemalloc/jemalloc.h

diff --git a/include/jemalloc/jemalloc.h b/include/jemalloc/jemalloc.h
index 8f88f6d..c5dc830 100644
--- a/include/jemalloc/jemalloc.h
+++ b/include/jemalloc/jemalloc.h
@@ -64,7 +64,7 @@
  * these macro definitions.
  */
 #ifndef JEMALLOC_NO_RENAME
-#if defined(__ANDROID__)
+#if defined(__BIONIC__)
 #  define je_malloc_conf je_malloc_conf
 #  define je_malloc_message je_malloc_message
 #  define je_malloc je_malloc

src/jemalloc.c

diff --git a/src/jemalloc.c b/src/jemalloc.c
index c2bafc5..670b0ae 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -2930,7 +2930,7 @@
 
 /******************************************************************************/
 
-#if defined(__ANDROID__)
+#if defined(__BIONIC__)
 /* ANDROID extension */
 #include "android_je_iterate.c"
 #include "android_je_mallinfo.c"