commit 52de5d1a70a326f247a2728ea8489aaf92966021
author Tom Cherry <tomcherry@google.com> Fri Jul 19 11:36:49 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jul 19 11:36:49 2019 -0700
tree 326cf6648ec043d9100df916ce50822857ee65e0
parent d9be22958113bc2cfd80728cf7bc897c1d293ca3
parent 6b2532e19a76e9b809d2e52e677b1f2004159443

Merge "Change stdatomic.h check from defined(_USING_LIBCXX) to __has_include(<atomic>)"
am: 6b2532e19a

Change-Id: I78c3d5fb79a63edb71553cd1ebe554511361e6c5

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 42d280b..aac419c 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -38,6 +38,12 @@
         // For glibc.
         "-D__STDC_LIMIT_MACROS",
     ],
+    // Make the bionic tests implicitly test bionic's shadow call stack support.
+    arch: {
+        arm64: {
+           cflags: ["-fsanitize=shadow-call-stack"],
+        },
+    },
     stl: "libc++",
     sanitize: {
         address: false,