commit a1fecddd68851183eb509174497aa5268937e7e6
author Xin Li <delphij@google.com> Mon May 13 17:41:50 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 13 17:41:50 2019 -0700
tree cceecdb899aafd45bbba32cadefb44caffdcebe3
parent d4452aef52a2c87229f0d5588561a1330df8ed09
parent c3cfb94466842209799881826d66266b299b543a

[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
am: c3cfb94466 -s ours
am skip reason: subject contains skip directive

Change-Id: I2a38d079e78b18b825932da0f62583bd5faa9922

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index d65780c..db02d75 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,