Merge "Disable BTI for now." am: b039496446 am: 188a5f90d8 am: 2bf5b9ca57

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1969222 Change-Id: I6a6593cd4850d28a2e5a8fa12799d09994b80570
2022-02-07 17:47:37 +00:00
parent cbe9579d13 2bf5b9ca57
commit 2bfd0ddb90
1 changed files with 3 additions and 1 deletions
--- a/cc/config/arm64_device.go
+++ b/cc/config/arm64_device.go
@@ -33,7 +33,9 @@ var (
 		},
 		"armv8-a-branchprot": []string{
 			"-march=armv8-a",
-			"-mbranch-protection=standard",
+			// Disable BTI until drm vendors stop using OS libraries as sources
+			// of gadgets (https://issuetracker.google.com/216395195).
+			"-mbranch-protection=pac-ret",
 		},
 		"armv8-2a": []string{
 			"-march=armv8.2-a",