commit c77e201a3bcfb5c402433159a5b49e3b2cf498f6
author Ryan Prichard <rprichard@google.com> Mon Jan 28 19:24:51 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Jan 28 19:24:51 2019 -0800
tree d10a90584519c940a6e050b2fb99c5e8638173a6
parent 11de8448f10820d26832f41b00e9aad039805bc4
parent c872f7d661c88fcde461957c84d80b82e3e409e6

Merge commit 'ecdc451ccf9e3f6fa4a89ec99f0f59b0a8080516' into stage-aosp-master am: 41be8e99b3
am: c872f7d661

Change-Id: Ie7c0f20869cc3652f926592c5de6cb75807b0657

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 8b921d8..f8b06c3 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,