diff options
| author | Colin Cross <ccross@android.com> | 2021-12-17 01:57:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-17 01:57:02 +0000 |
| commit | 540563280a95233750aeaf2caa0f07450e1c24fd (patch) | |
| tree | 1310d30a760d2309aeea9845a45dfe3f3f3633f9 | |
| parent | 59db5dede57cd4fd1038e81dd3f67be8f418c743 (diff) | |
| parent | 33133c8a43faa55e0214b3df61b20b45cb899140 (diff) | |
| download | gwp_asan-540563280a95233750aeaf2caa0f07450e1c24fd.tar.gz | |
Only use libc_headers for bionic am: 0b40b332ff am: 8d7ead642a am: 84c41e6b4c am: 33133c8a43
Original change: https://android-review.googlesource.com/c/platform/external/gwp_asan/+/1927838
Change-Id: Iffb2e4c6bf9917d899efe2c152b7db94be7b49c0
| -rw-r--r-- | Android.bp | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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", |