commit a26bf7f9b939ac5ee2c09549a8aebc497765b43b
author Christopher Ferris <cferris@google.com> Tue Mar 19 08:52:19 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 19 08:52:19 2019 -0700
tree d5e685094e385b2163105e5cd7f128143cfc1a22
parent 2c8195faf204307c7db37c3150bc2e933ebf5b04
parent b43e4e4788e0377e895d52c2dd7c15b32cb34e21

Merge "Increase num tries before failing." am: 4a8b288704 am: 6ca10345a6
am: b43e4e4788

Change-Id: I01c04ab1b87476e145ebe7dc57f3f76573fdc84d

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index ab11d47..c200ef4 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,