commit 8ad8abf2333a61c69691490eb2aa7123232b4e58
author Ryan Prichard <rprichard@google.com> Thu Jan 17 15:53:29 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 17 15:53:29 2019 -0800
tree 1de74c549beaa5b4359cd956acb9c88c0b277cd6
parent 3923469cff4e3840a50e64c6d40db1792c2acbe5
parent 582280600e862a542af99c8a9515ead10c1ffdad

Merge changes Ia08e1b5c,I60e589dd,Ib7edb665,Ibf1bf5ec,Ibd623857 am: 9a238653c1 am: b387a9270c
am: 582280600e

Change-Id: I7548beb2cc0b92561566044ad3e3d9c5f26c5c7b

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index beed07a..5a060b5 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,