DO NOT MERGE - Merge Android 10 into master

Bug: 139893257 Change-Id: Ib97781dd4ee5e719cc2376221708bb1c8aaeaf73
2019-09-04 17:50:37 -07:00 · 2019-09-04 17:50:37 -07:00 · 9dd8a90472
commit 9dd8a90472
parent e2c10d8de0 000cdf8732
1 changed files with 6 additions and 0 deletions
--- a/tests/Android.bp
+++ b/tests/Android.bp
@ -38,6 +38,12 @@ cc_defaults {
        // 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,