commit 32128b7aabb3f65b029d42a7989bbba3a78455b5
author Vic Yang <victoryang@google.com> Fri Jan 25 15:09:29 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Jan 25 15:09:29 2019 -0800
tree 378d2d5b79d79cfc3b9b8514127d957405cc7d9c
parent 5bc393b77364538ef8fa25f0f03db0b34293e049
parent cb4dc38d17802b56bbac8941c096b63eb60ee7cc

Merge changes Iece631a5,I53769e0e am: fbd6f3c796 am: 2a6b21f94c
am: cb4dc38d17

Change-Id: Ic965d89396fe54037bd68f63f8f865bf4d1ffeb3

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,