diff options
| author | alk3pInjection <webmaster@raspii.tech> | 2022-09-06 02:32:00 +0800 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2022-09-06 02:32:00 +0800 |
| commit | c88820187861933b89706323d20244210e9cd3c0 (patch) | |
| tree | 22feaee13e2f2ac1fb21ce24dceb9447dc5239a0 | |
| parent | 692ca1f09b914d8d9fac2b28f84cafaa76129a70 (diff) | |
| parent | acc7d004b96b89bd87e31dbdbb491c6d47f5a579 (diff) | |
Merge tag 'android-13.0.0_r2' into HEADtachibana-mr1tachibana
Android 13.0.0 Release 2 (TP1A.220624.021)
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYvp5fQAKCRDorT+BmrEO
# eImbAJ0dpRyJrdS8Mj08osBvFAKph/4/egCgktm6CLz5TnFBZSlgiJoSPcCY+38=
# =MgJL
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 16 Aug 2022 12:51:09 AM HKT
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Can't check signature: No public key
Change-Id: Ie916049edaa3e97b39a5cd759223daeffd81375e
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | include/jemalloc/internal/jemalloc_internal_defs_host.h | 2 | ||||
| -rw-r--r-- | src/jemalloc.c | 2 |
3 files changed, 14 insertions, 4 deletions
@@ -123,7 +123,6 @@ android_product_variables = { cc_defaults { name: "jemalloc5_defaults", - defaults: ["linux_bionic_supported"], host_supported: true, native_bridge_supported: true, cflags: common_cflags, @@ -133,7 +132,7 @@ cc_defaults { cflags: android_common_cflags, product_variables: android_product_variables, }, - linux_glibc: { + linux_bionic: { enabled: true, }, }, @@ -205,6 +204,11 @@ cc_library { system_shared_libs: [], header_libs: ["libc_headers"], }, + musl: { + // Linking against musl uses libjemalloc5 by default, list only + // libc_musl here to avoid a circular dependency. + system_shared_libs: ["libc_musl"], + }, }, } @@ -345,8 +349,10 @@ cc_test { test_per_src: true, target: { - linux_glibc: { + linux_bionic: { enabled: true, + }, + linux_glibc: { // The sanitizer does not work for these tests on the host. sanitize: { never: true, @@ -366,6 +372,7 @@ cc_library_static { cflags: [ "-U_FORTIFY_SOURCE", "-DJEMALLOC_INTEGRATION_TEST", + "-DJEMALLOC_NO_RENAME", ], local_include_dirs: [ @@ -405,6 +412,7 @@ cc_test { cflags: common_cflags + [ "-DJEMALLOC_INTEGRATION_TEST", + "-DJEMALLOC_NO_RENAME", ], local_include_dirs: common_c_local_includes + [ diff --git a/include/jemalloc/internal/jemalloc_internal_defs_host.h b/include/jemalloc/internal/jemalloc_internal_defs_host.h index 7cdb6521..0e85fdfe 100644 --- a/include/jemalloc/internal/jemalloc_internal_defs_host.h +++ b/include/jemalloc/internal/jemalloc_internal_defs_host.h @@ -370,6 +370,8 @@ /* * Defined if strerror_r returns char * if _GNU_SOURCE is defined. */ +#ifdef __GLIBC__ #define JEMALLOC_STRERROR_R_RETURNS_CHAR_WITH_GNU_SOURCE +#endif #endif /* JEMALLOC_INTERNAL_DEFS_H_ */ diff --git a/src/jemalloc.c b/src/jemalloc.c index 4c94568d..8ffafb97 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -117,7 +117,7 @@ static uint8_t malloc_slow_flags; #ifdef JEMALLOC_THREADED_INIT /* Used to let the initializing thread recursively allocate. */ -# define NO_INITIALIZER ((unsigned long)0) +# define NO_INITIALIZER ((pthread_t)0) # define INITIALIZER pthread_self() # define IS_INITIALIZER (malloc_initializer == pthread_self()) static pthread_t malloc_initializer = NO_INITIALIZER; |