diff options
| author | Elliott Hughes <enh@google.com> | 2023-12-08 21:41:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-08 21:41:29 +0000 |
| commit | 947d04aac874306381d4e8d67f4a0b8fc0d98064 (patch) | |
| tree | 45264c105b767a67ddbcfe6a7fc2918ed64f118b | |
| parent | cc278e23b4934cc6341ed4c890fda1ee1c66099b (diff) | |
| parent | dd2964c7b004442e12f2d7c50c1541358fad014a (diff) | |
| download | bionic-947d04aac874306381d4e8d67f4a0b8fc0d98064.tar.gz | |
Merge "Remove obsolete workaround." into main am: 4fa4354799 am: 9f0b15c8c5 am: dd2964c7b0
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2863363
Change-Id: I52fd59fe0c919be9a002d274dc8677343c5838fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/Android.bp | 22 | ||||
| -rw-r--r-- | tests/libs/Android.bp | 2 |
2 files changed, 0 insertions, 24 deletions
diff --git a/tests/Android.bp b/tests/Android.bp index 4534241ff..a53418aa0 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -583,17 +583,6 @@ cc_test_library { shared: { enabled: false, }, - // TODO: still needed? - // 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 that used to be here configured - // 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 { @@ -612,17 +601,6 @@ cc_test_library { shared: { enabled: false, }, - // TODO: still needed? - // 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 that used to be here configured - // 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 { diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp index 0f8d22b4a..b2f1debfb 100644 --- a/tests/libs/Android.bp +++ b/tests/libs/Android.bp @@ -34,7 +34,6 @@ cc_defaults { gtest: false, sanitize: { address: false, - fuzzer: false, }, stl: "libc++_static", target: { @@ -637,7 +636,6 @@ cc_test_library { ], sanitize: { address: false, - fuzzer: false, }, stl: "libc++_static", target: { |