commit 0dd87c37d48c6b95d216a392e2bd0d4f68769bdf
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 27 22:11:19 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 27 22:11:19 2020 +0000
tree d7551445fe33810c7fe3b13c656414a31685f070
parent c4f9c9d1710fd7ba2e252e8b3268e179bf8bc5fe
parent d901ec69644db8458d987af257dd78d724b4a0ae

Merge "[unit tests] Add '-mbranch-protection=standard' flag to arm64"

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index d1afd51..b840f36 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -39,10 +39,14 @@
         "-D__STDC_LIMIT_MACROS",
     ],
     header_libs: ["bionic_libc_platform_headers"],
-    // Make the bionic tests implicitly test bionic's shadow call stack support.
+    // Ensure that the tests exercise shadow call stack support and
+    // the hint space PAC/BTI instructions.
     arch: {
         arm64: {
-           cflags: ["-fsanitize=shadow-call-stack"],
+            cflags: [
+                "-fsanitize=shadow-call-stack",
+                "-mbranch-protection=standard",
+            ],
         },
     },
     stl: "libc++",