tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to remove direct include of jemalloc_new.

Browse source 
In order to support scudo for non-svelte malloc and jemalloc5 for
svelte malloc, do not include jemalloc_new directly. Move that to
the export_include_dirs for libjemalloc5.

Also, change the way to enable scudo so that it only enables it
for the non-svelte config for now.

Bug: 137795072

Test: Builds
Change-Id: I3d68b443fe4d6b21729795649d0dcf66b7e95e03
This commit is contained in:
Christopher Ferris 2020-01-24 18:06:42 -08:00
parent 1d8f6f2f5d
commit 4df29ed9b4
1 changed files with 18 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
libc/Android.bp
View file

@ -86,25 +86,27 @@ cc_defaults {
},
}
libc_scudo_product_variables = {
malloc_not_svelte: {
cflags: ["-DUSE_SCUDO"],
whole_static_libs: ["libscudo"],
exclude_static_libs: [
"libjemalloc5",
"libc_jemalloc_wrapper",
],
},
}
// Defaults for native allocator libs/includes to make it
// easier to change.
// To enable scudo, change the below to libc_scudo_defaults
// and comment out the defaults line in libc_scudo shared
// library.
// Enable scudo for non-svelte config by adding the line:
// product_variables: libc_scudo_product_variables,
// to the cc_defaults below. And remove the defaults line
// in the libc_scudo library.
// ========================================================
cc_defaults {
name: "libc_native_allocator_defaults",
defaults: ["libc_jemalloc5_defaults"],
}
cc_defaults {
name: "libc_jemalloc5_defaults",
include_dirs: [
"external/jemalloc_new/include",
],
whole_static_libs: [
"libjemalloc5",
"libc_jemalloc_wrapper",
@ -119,30 +121,9 @@ cc_library_static {
srcs: ["bionic/jemalloc_wrapper.cpp"],
cflags: ["-fvisibility=hidden"],
include_dirs: [
"external/jemalloc_new/include",
],
}
cc_defaults {
name: "libc_scudo_defaults",
cflags: [
"-DUSE_SCUDO_SVELTE",
],
product_variables: {
malloc_not_svelte: {
cflags: [
"-UUSE_SCUDO_SVELTE",
"-DUSE_SCUDO",
],
},
},
whole_static_libs: [
"libscudo",
],
// Used to pull in the jemalloc include directory so that if the
// library is removed, the include directory is also removed.
static_libs: ["libjemalloc5"],
}
// ========================================================