commit fca4014ac44454fc5502198bd11751b7a63e3766
author Vic Yang <victoryang@google.com> Tue Apr 16 18:06:20 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 16 18:06:20 2019 -0700
tree fe792d548eda20c634c3042bc6d494f365356b1c
parent 3571c657f095c5b04ec5136f598b5143a6b1b197
parent ea3be9f372bbb7dc75e06288194111abdc7fa7d3

Merge "Fix linker compilation with timing enabled" am: be128f38d6
am: ea3be9f372

Change-Id: I1b4b6137288aec72cb70d6ad264724dcd9e56064

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 71cf8a6..3d5feb2 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,