commit ad669dfbceeff100ebc1ee7460c3cb9f33f5790e
author Ryan Prichard <rprichard@google.com> Thu Jan 17 20:30:53 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 17 20:30:53 2019 -0800
tree 18cabd5dabc821cd653aff8a2fe1b630c39100f7
parent 6db0898c388718207730cc5ce442550485f2cc84
parent 777313b3cc704917b17bb3cbd26d712285ae560d

Merge "Fix soinfo_tls::module dangling reference" am: 314c0f7989 am: 5e60f690d9
am: 777313b3cc

Change-Id: I3ba4572b56b9ea3b862b91891acb6ff398436167

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index beed07a..5a060b5 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: {
         never: true,