commit 02e63858d496c98cb6cc49f9cddde859f664a912
author Evgenii Stepanov <eugenis@google.com> Tue Mar 19 21:39:18 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 19 21:39:18 2019 -0700
tree 48bdbbe572cc71aa21d6bca7913694b4c2790fc3
parent b605e407d5a91c99c956ab23d52d7335aaf47893
parent a5446bcd763609a4020a2b57806166989aba6baa

Merge "Annotate vfork for hwasan." am: 8b8e7d0461 am: 48c5b26a9a
am: a5446bcd76

Change-Id: I8c813020457a92db956c05eb1812cb9e9df2cd78

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,