commit e98e0ea3f5e51567ed3b7a5bab9ec1c71e932bc8
author Xin Li <delphij@google.com> Mon Feb 25 08:10:12 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Feb 25 08:10:12 2019 -0800
tree 4d3edbf4430ccbdfb1c9064766dff127b3170d6f
parent 5c9a41902e19973e6205b00200f0265904a50149
parent 60ce5440ffe9b6c89d23b9c89548936949d4a848

[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 6dc9211625 -s ours
am: 60ce5440ff -s ours
am skip reason: subject contains skip directive

Change-Id: Ic270f9b1888f826db3473a8b04cb86f36797c8d2

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,