diff options
| author | Mitch Phillips <mitchp@google.com> | 2019-05-01 14:26:13 -0700 |
|---|---|---|
| committer | Mitch Phillips <mitchp@google.com> | 2019-05-30 16:49:13 +0000 |
| commit | dfde0eeee169f4a7e28f91e6f0d2902cc6d9ecc0 (patch) | |
| tree | 49ec307ef79ee3641dd10ac811dba5f7fa127a64 | |
| parent | cfede4fdd1f98549a933c48622d6866c0afeaae6 (diff) | |
Change SANITIZE_TARGET refs from 'coverage' to 'fuzzer'.
Cleanup of references to 'coverage' in build files. Part of a larger
cleanup to make fuzzing work again in the Android build tree.
Also fixed a test issue with emulated TLS with the new changes, and
removed libc.so fuzzer support until a linked bug is fixed
(b/132640749).
Bug: 121042685
Test: With all patches in the bug merged: mmma bionic
Change-Id: I592352fe9210ff811a2660a88cbbfe48d70a1e57
Merged-In: I592352fe9210ff811a2660a88cbbfe48d70a1e57
| -rw-r--r-- | libc/Android.bp | 2 | ||||
| -rw-r--r-- | libm/Android.bp | 2 | ||||
| -rw-r--r-- | tests/Android.bp | 18 | ||||
| -rw-r--r-- | tests/libs/Android.bp | 2 |
4 files changed, 22 insertions, 2 deletions
diff --git a/libc/Android.bp b/libc/Android.bp index 570e78568..7d0836584 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -73,6 +73,8 @@ cc_defaults { sanitize: { address: false, integer_overflow: false, + // TODO(b/132640749): Fix broken fuzzer support. + fuzzer: false, }, native_coverage: false, recovery_available: true, diff --git a/libm/Android.bp b/libm/Android.bp index 48b9a5f06..6d17e8643 100644 --- a/libm/Android.bp +++ b/libm/Android.bp @@ -503,7 +503,7 @@ cc_library { native_coverage: bionic_coverage, sanitize: { address: false, - coverage: false, + fuzzer: false, integer_overflow: false, }, stl: "none", diff --git a/tests/Android.bp b/tests/Android.bp index d65780c26..e0faa5fe6 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -235,6 +235,15 @@ cc_test_library { cflags: [ "-fno-emulated-tls", ], + // With fuzzer builds, compiler instrumentation generates a reference to the + // __sancov_lowest_stack variable, which (for now) is defined by the fuzzer + // library as an emutls symbol. The -fno-emulated-tls flag above configures + // the compiler to reference an ordinary ELF TLS __sancov_lowest_stack + // symbol instead, which isn't defined. Disable the fuzzer for this test + // until the platform is switched to ELF TLS. + sanitize: { + fuzzer: false, + }, } cc_test_library { @@ -256,6 +265,15 @@ cc_test_library { cflags: [ "-fno-emulated-tls", ], + // With fuzzer builds, compiler instrumentation generates a reference to the + // __sancov_lowest_stack variable, which (for now) is defined by the fuzzer + // library as an emutls symbol. The -fno-emulated-tls flag above configures + // the compiler to reference an ordinary ELF TLS __sancov_lowest_stack + // symbol instead, which isn't defined. Disable the fuzzer for this test + // until the platform is switched to ELF TLS. + sanitize: { + fuzzer: false, + }, } // ----------------------------------------------------------------------------- diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp index 422cd75c0..98d4f25e7 100644 --- a/tests/libs/Android.bp +++ b/tests/libs/Android.bp @@ -29,7 +29,7 @@ cc_defaults { gtest: false, sanitize: { address: false, - coverage: false, + fuzzer: false, }, stl: "libc++_static", target: { |