diff options
| author | Elliott Hughes <enh@google.com> | 2023-12-11 15:54:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-11 15:54:55 +0000 |
| commit | 22de3bdef8c419a9a98af6d1e6cea9765609a4a9 (patch) | |
| tree | 8ff5d37dc8ae9443de95cdad43d61b139d50a8e3 | |
| parent | ed499a7c71c28b6af2c0b2da77b240b746ef34bf (diff) | |
| parent | 9e2b34364c8c8a7353748459a629d2e921d8f0d9 (diff) | |
| download | scudo-22de3bdef8c419a9a98af6d1e6cea9765609a4a9.tar.gz | |
Merge "Remove explicit -fno-emulated-tls." into main am: 5173bc3076 am: 9e2b34364c
Original change: https://android-review.googlesource.com/c/platform/external/scudo/+/2866654
Change-Id: I01e31ab345c56faddeae52cb11ac92f2da3f3957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 4f24fcffcac..3711973c88e 100644 --- a/Android.bp +++ b/Android.bp @@ -105,7 +105,6 @@ cc_defaults { "-fno-rtti", // This option speeds up alloc/free code paths by about 5% to 7%. "-fno-stack-protector", - "-fno-emulated-tls", "-Wall", "-Wextra", @@ -223,7 +222,6 @@ cc_defaults { "external/scudo/standalone/include", ], cflags: [ - "-fno-emulated-tls", "-Wconversion", // In memtag_test.cpp, some tests are disabled by GTEST_SKIP() so that // they won't be run. However, for those disabled tests, it may contain |