Merge "Rename linker greylist to exempt-list"
diff --git a/libc/Android.bp b/libc/Android.bp
index b278774..6340340 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -100,6 +100,9 @@
malloc_pattern_fill_contents: {
cflags: ["-DSCUDO_PATTERN_FILL_CONTENTS"],
},
+ malloc_not_svelte: {
+ cflags: ["-DUSE_SCUDO"],
+ },
},
}
@@ -1010,7 +1013,6 @@
"bionic/bionic_arc4random.cpp",
"bionic/bionic_futex.cpp",
"bionic/bionic_netlink.cpp",
- "bionic/bionic_systrace.cpp",
"bionic/bionic_time_conversions.cpp",
"bionic/brk.cpp",
"bionic/c16rtomb.cpp",
@@ -1177,7 +1179,10 @@
cflags: ["-DTREBLE_LINKER_NAMESPACES"],
},
},
- whole_static_libs: ["libsystemproperties"],
+ whole_static_libs: [
+ "libc_bionic_systrace",
+ "libsystemproperties",
+ ],
cppflags: ["-Wold-style-cast"],
local_include_dirs: ["stdio"],
include_dirs: ["bionic/libstdc++/include"],
@@ -1186,6 +1191,21 @@
}
// ========================================================
+// libc_bionic_systrace.a
+// ========================================================
+
+cc_library_static {
+ name: "libc_bionic_systrace",
+ defaults: ["libc_defaults"],
+ srcs: [
+ "bionic/bionic_systrace.cpp",
+ ],
+ apex_available: [
+ "com.android.runtime",
+ ],
+}
+
+// ========================================================
// libc_pthread.a - pthreads parts that previously lived in
// libc_bionic.a. Relocated to their own library because
// they can't be included in libc_ndk.a (as the layout of
diff --git a/libc/bionic/libc_init_common.cpp b/libc/bionic/libc_init_common.cpp
index f1350d5..01b6a42 100644
--- a/libc/bionic/libc_init_common.cpp
+++ b/libc/bionic/libc_init_common.cpp
@@ -86,11 +86,14 @@
}
static void __libc_init_malloc_fill_contents() {
+// TODO(b/158870657) make this unconditional when all devices support SCUDO.
+#if defined(USE_SCUDO)
#if defined(SCUDO_PATTERN_FILL_CONTENTS)
scudo_malloc_set_pattern_fill_contents(1);
#elif defined(SCUDO_ZERO_CONTENTS)
scudo_malloc_set_zero_contents(1);
#endif
+#endif
}
__BIONIC_WEAK_FOR_NATIVE_BRIDGE