diff options
Diffstat (limited to 'libc/Android.bp')
-rw-r--r-- | libc/Android.bp | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/libc/Android.bp b/libc/Android.bp index 84fa498d3..d8467a88a 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -55,7 +55,9 @@ libc_common_flags = [ cc_defaults { name: "libc_defaults", defaults: ["linux_bionic_supported"], - cflags: libc_common_flags, + cflags: libc_common_flags + [ + "-DUSE_SCUDO", + ], asflags: libc_common_flags, conlyflags: ["-std=gnu99"], cppflags: [], @@ -98,8 +100,8 @@ cc_defaults { malloc_pattern_fill_contents: { cflags: ["-DSCUDO_PATTERN_FILL_CONTENTS"], }, - malloc_not_svelte: { - cflags: ["-DUSE_SCUDO"], + malloc_low_memory: { + cflags: ["-UUSE_SCUDO"], }, }, @@ -112,32 +114,31 @@ cc_defaults { tidy_disabled_srcs: ["upstream-*/**/*.c"], } -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 disable scudo for the non-svelte config remove the line: -// product_variables: libc_scudo_product_variables, -// in the cc_defaults below. // ======================================================== cc_defaults { name: "libc_native_allocator_defaults", whole_static_libs: [ - "libjemalloc5", - "libc_jemalloc_wrapper", + "libscudo", + ], + cflags: [ + "-DUSE_SCUDO", ], header_libs: ["gwp_asan_headers"], - product_variables: libc_scudo_product_variables, + product_variables: { + malloc_low_memory: { + cflags: ["-UUSE_SCUDO"], + whole_static_libs: [ + "libjemalloc5", + "libc_jemalloc_wrapper", + ], + exclude_static_libs: [ + "libscudo", + ], + }, + }, } // Functions not implemented by jemalloc directly, or that need to @@ -1223,9 +1224,6 @@ cc_library_static { // off64_t/time64_t support on LP32. "bionic/legacy_32_bit_support.cpp", "bionic/time64.c", - - // TODO: move to libc/bionic/legacy_32_bit_support.cpp or #if __LP64__ instead. - "bionic/mmap.cpp", ], }, }, @@ -2990,3 +2988,8 @@ filegroup { name: "versioner-dependencies", srcs: ["versioner-dependencies/**/*"], } + +filegroup { + name: "linux_capability_header", + srcs: ["kernel/uapi/linux/capability.h"], +} |