commit b578919004a12157e860e7675c7ba4a79ea72a8c
author Haibo Huang <hhb@google.com> Wed Mar 20 11:09:26 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Mar 20 11:09:26 2019 -0700
tree 3b2af39b91d80b7e6b99d6b703de324bda1c2075
parent 4d78eb9a6d58e00fd723370353644e2d00a02a13
parent 3f212c4cefcbb7cf7db8bc8d290ef058be469748

Merge "Remove workaround for x86 ifunc" am: b2a29cb95b am: e8384f9230
am: 3f212c4cef

Change-Id: I8398edea708e2ff1ead6c2dd2fb5b143dd7e9ec5

tests/Android.bp

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