commit a1533dfa54bfa4234d899df6f418d8d7fb321931
author Christopher Ferris <cferris@google.com> Wed Jan 23 22:29:57 2019 -0800
committer Christopher Ferris <cferris@google.com> Wed Jan 23 22:34:44 2019 -0800
tree 8d7cecda118331263c54a33062bd1f16725b85a9
parent 0159d110c33cf121de0f8796f01c78abd65828e4
parent 011d62483d0a81d59222a8a65d44a3ba0f2e0222

resolve merge conflicts of 011d62483d0a81d59222a8a65d44a3ba0f2e0222 to master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id8156e5a3c0ed43a7410ea2f5c668570309ffbdc

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 8ac0531..5cfcef8 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: {
         never: true,