Merge "linker: only generate log messages when logging is enabled" am: 190626872a am: 82e709e330
am: 9850b5f5f6

Change-Id: I5bae8e88c1de9bdfe8a5f1591d190f4ffbffbcb0
diff --git a/tests/Android.bp b/tests/Android.bp
index beed07a..5a060b5 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,