commit 9e20193f9e22de45aa353a7b87748c453c9caa9d
author Ryan Prichard <rprichard@google.com> Thu Jan 24 12:08:09 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 24 12:08:09 2019 -0800
tree 0207af336cdc9a10648be5263036f36df859f79c
parent 027a1c0818da5ff5cd5e2a8ce853fd42df292c2e
parent 0dff05088ae967447745a7bad1f400eaad8ea60b

Merge "Reassign TLS slot 2 to TLS_SLOT_APP." am: 3ce06c7b0a am: e74ab5e8a4
am: 0dff05088a

Change-Id: Iddd81e7187ed18ea45a35cd5c29fec5f7a6fb0f2

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,