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

Change-Id: Iddd81e7187ed18ea45a35cd5c29fec5f7a6fb0f2
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,