commit f23b33bd224cf4bdc3e2633d24d54cf6abda4906
author Yi Kong <yikong@google.com> Mon Feb 25 22:24:09 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Feb 25 22:24:09 2019 -0800
tree 47dc2bc5de7cde5994b1447e08fca58d14ad44e7
parent 3c7e9b3ac409df0d216cc1411d58c79eed5dc5dd
parent 74cef25b0bdcf4b997dc86f3357cc792707d4118

Merge changes I070d3a26,Ie9176587 am: e65558a0a4 am: a0fad4d7f1
am: 74cef25b0b

Change-Id: I2964ed6116a91a1a0e96378fd5ac9d80b3e73815

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,