summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2021-12-17 01:30:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-17 01:30:49 +0000
commit33133c8a43faa55e0214b3df61b20b45cb899140 (patch)
tree1310d30a760d2309aeea9845a45dfe3f3f3633f9
parent0db552b662b673b89de1bfc03aefb04baf7c900f (diff)
parent84c41e6b4c39b050e66225c6da359de95359554e (diff)
downloadgwp_asan-33133c8a43faa55e0214b3df61b20b45cb899140.tar.gz
Only use libc_headers for bionic am: 0b40b332ff am: 8d7ead642a am: 84c41e6b4c
Original change: https://android-review.googlesource.com/c/platform/external/gwp_asan/+/1927838 Change-Id: Iafdb3126fd4880680c592879dc15885da97900bf
-rw-r--r--Android.bp9
1 files changed, 6 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 4b57e62..e45795f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -71,7 +71,12 @@ cc_defaults {
// GWP-ASan is used by bionic libc, and should have no libc/libc++
// dependencies.
- system_shared_libs: [],
+ target: {
+ bionic: {
+ system_shared_libs: [],
+ header_libs: ["libc_headers"],
+ },
+ },
stl: "none",
}
@@ -104,7 +109,6 @@ cc_library_static {
defaults: ["gwp_asan_no_libs_defaults"],
header_libs: [
"gwp_asan_headers",
- "libc_headers", // Required for pthread.h in mutex.h.
],
srcs: [
"gwp_asan/common.cpp",
@@ -139,7 +143,6 @@ cc_library {
defaults: ["gwp_asan_defaults"],
header_libs: [
"gwp_asan_headers",
- "libc_headers", // Required for assert.h
],
srcs: [
"gwp_asan/common.cpp",