diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-10-22 16:20:47 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-22 16:20:47 -0700 |
| commit | 2edd2d5799cfc3bea265a72a35c55666506cf3ce (patch) | |
| tree | d9dfac14882e3092be431d7c1fe264df06f976ce | |
| parent | e94214c07a36e807a7fb13ecf26d0a017c954479 (diff) | |
| parent | 65f52c32b6336692f47b7a3b1fabdb584c20f65f (diff) | |
| download | jemalloc-2edd2d5799cfc3bea265a72a35c55666506cf3ce.tar.gz | |
Fix settings for host bionic am: 9447c6b21b am: 3a57670252
am: 65f52c32b6
Change-Id: I9880fd5d143ad1cb4ac7163986f7328394b8527a
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | include/jemalloc/internal/jemalloc_internal_defs.h | 5 | ||||
| -rw-r--r-- | include/jemalloc/jemalloc.h | 2 | ||||
| -rw-r--r-- | src/jemalloc.c | 2 |
4 files changed, 9 insertions, 3 deletions
@@ -83,6 +83,9 @@ cc_defaults { ], product_variables: android_product_variables, }, + linux_bionic: { + cflags: ["-DJEMALLOC_TCACHE"], + }, linux_glibc: { enabled: true, }, 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. */ 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 @@ extern "C" { * 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 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 @@ jemalloc_postfork_child(void) /******************************************************************************/ -#if defined(__ANDROID__) +#if defined(__BIONIC__) /* ANDROID extension */ #include "android_je_iterate.c" #include "android_je_mallinfo.c" |