diff options
| author | Chia-hung Duan <chiahungduan@google.com> | 2023-04-07 04:26:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-07 04:26:47 +0000 |
| commit | fafe22b44aca9bc62d36c66717ac6f9f88f0785d (patch) | |
| tree | a920344fa5e37f9ede4f8230f08c9e3b38fc244e | |
| parent | 086d2c65a56d00c78ac4c0cda1c8cfbaf75ae288 (diff) | |
| parent | 0f72778e10886a20055be204c13a888d7b660123 (diff) | |
| download | scudo-fafe22b44aca9bc62d36c66717ac6f9f88f0785d.tar.gz | |
Merge "[scudo] Add missing memtag_test.cpp to Android.bp" am: 4c08b1bf09 am: df60cbf4e0 am: 0f72778e10
Original change: https://android-review.googlesource.com/c/platform/external/scudo/+/2526608
Change-Id: I066fc71ee9d79766d4690c80f8d08603a53ea627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 8f5e848519c..43955e9aaac 100644 --- a/Android.bp +++ b/Android.bp @@ -194,8 +194,13 @@ cc_defaults { "external/scudo/standalone/include", ], cflags: [ - "-Wno-unused-parameter", "-fno-emulated-tls", + // 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 + // unreachable code paths which will mislead some compiler checks. Given + // this flag won't be impacted too much, disable it only in the test. + "-Wno-unreachable-code-loop-increment", + "-Wno-unused-parameter", "-DSCUDO_DEBUG", ], target: { @@ -222,6 +227,7 @@ cc_test { "standalone/tests/flags_test.cpp", "standalone/tests/list_test.cpp", "standalone/tests/map_test.cpp", + "standalone/tests/memtag_test.cpp", "standalone/tests/mutex_test.cpp", "standalone/tests/primary_test.cpp", "standalone/tests/quarantine_test.cpp", |