commit 7641ad0087775762b74bc3873c415a55c10f2187
author Peter Collingbourne <pcc@google.com> Wed Mar 27 18:47:50 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Mar 27 18:47:50 2019 -0700
tree 9df729fa55e7aeb05f86b435ecd0dafe079d51de
parent 539191979d1f3b92daaf87456803daf7d1f049ed
parent 9d4306cde480ef5178868880075a092cf149a0d2

Merge "Use PR_SET_VMA_ANON_NAME to name the abort message mapping." am: 14025fd2bf am: 04b0178166
am: 9d4306cde4

Change-Id: I0fb6c569ab4779e4ec704e951eee70c6e652b3ab

tests/Android.bp

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