commit 5c9a41902e19973e6205b00200f0265904a50149
author Yi Kong <yikong@google.com> Wed Feb 20 11:15:05 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 20 11:15:05 2019 -0800
tree 4d3edbf4430ccbdfb1c9064766dff127b3170d6f
parent 35e3d2ba85f33346c3f35f280fa217a1179d7a1b
parent 55038fbec9621bfb82a78d6a967a596901239308

Merge "Revert "Turn on XOM for libc"" am: b656d4a1da am: 5a7769ecc4
am: 55038fbec9

Change-Id: I44ead7f9f1bac11fcc3673bd418339749484b964

tests/Android.bp

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