commit fc02f56e4d1d58e4e4245cead9b3d857067d6af2
author Logan Chien <loganchien@google.com> Wed Mar 20 19:19:25 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Mar 20 19:19:25 2019 -0700
tree 2698f2d52cba9befad614c4500b5990966c80712
parent fbca9814030aa6c1e48bb48ab5bf8a65ad6b2073
parent 870e9f1f95e336eb0ed7ef22fa17f162cd2a3557

Merge changes Ie7bf555b,Ia7d5fbdc,I3f05ba19 am: e6b6640042 am: 6f55059905
am: 870e9f1f95

Change-Id: If30691033eedae076171dc5ae675e7b59a3c919e

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,