commit d42a1d1eaae86748d8c7da2f3fc3dd8e4bfa3ed3
author Peter Collingbourne <pcc@google.com> Wed Aug 14 22:44:38 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 14 22:44:38 2019 -0700
tree 9e60f128c3a66ad799e3846685bfc63d688ffedb
parent 25b6ea7e25dc2df5ddd10e578d34d614a758f22e
parent 2fbbc253f6886524a4a6e56ad763100d05b6ddcd

Merge "Fix OOB read in fortify str[np]cpy implementations found by hwasan."
am: 2fbbc253f6

Change-Id: Ie296d45cebb5c7be5a8a22e7168c1e4f361c1b97

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 42d280b..aac419c 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,