commit 4e652b3b34fc95d8e86b45f016032de49cbe1bac
author George Burgess IV <gbiv@google.com> Thu May 23 23:07:45 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 23 23:07:45 2019 -0700
tree ab5f55c3d23f73403495c63d23ff55c555a647bf
parent 1580c9f0fdf6f36372e1f700683df5e6ecd74d2c
parent 576271755bec1bc9dd8102f7d1653a3c1ada5a9f

Merge "fortify: use __builtin_constant_p for more short-circuits" am: 30d4c6fb06
am: 576271755b

Change-Id: Ied86e65babdba986769bf7bf82606cb9f4975e41

tests/Android.bp

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