commit 3fc715e803eb2853e6976955d44f5f438d0c5eb9
author Yi Kong <yikong@google.com> Thu Feb 28 18:40:24 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Feb 28 18:40:24 2019 -0800
tree 2cdc8973618a3dcfea19b992ab590790d9d0902b
parent 75ab8743dd371b648b1109e40312f17ee0155de3
parent 94c36d27974cdd86265c5b24b8e158db548a9ba5

Merge "Workaround string-plus-int warning" am: 0771b752f1 am: 4c35405d24
am: 94c36d2797

Change-Id: If7f91f15759f997d1ee1398b19364efb09cc397a

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 75c6f9f..f9ddd66 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,