Merge "Workaround string-plus-int warning" am: 0771b752f1 am: 4c35405d24
am: 94c36d2797
Change-Id: If7f91f15759f997d1ee1398b19364efb09cc397a
diff --git a/tests/Android.bp b/tests/Android.bp
index 75c6f9f..f9ddd66 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,