commit 9d63577b721fa5b915c18432789085072cd3a0b8
author Treehugger Robot <treehugger-gerrit@google.com> Tue Feb 04 03:30:00 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 04 03:30:00 2020 +0000
tree 3103cfb3eea084bd93a8edda4e36b11d7e35b102
parent 8f4a335046caa371419bf2e883655867c3e1f673
parent b1652f31cea6dd899725d5e7892dd13a86df5fdf

Merge "[GWP-ASan] Add late-init test (merged from upstream)."

Android.bp

diff --git a/Android.bp b/Android.bp
index 0d15313..d62ae86 100644
--- a/Android.bp
+++ b/Android.bp
@@ -87,10 +87,12 @@
         "gwp_asan/tests/basic.cpp",
         "gwp_asan/tests/compression.cpp",
         "gwp_asan/tests/harness.cpp",
+        "gwp_asan/tests/late_init.cpp",
         "gwp_asan/tests/mutex_test.cpp",
         "gwp_asan/tests/slot_reuse.cpp",
         "gwp_asan/tests/thread_contention.cpp",
     ],
     include_dirs: ["bionic/libc/async_safe/include"],
     test_suites: ["general-tests"],
+    cflags: ["-fno-emulated-tls"],
 }