Merge "Revert "Disable BTI for now."" am: ba4a566e2d

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2020301

Change-Id: I625e91cef018a7c94ab7e7abcc761efd60840f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes
2022-06-06 20:38:05 +00:00
committed by Automerger Merge Worker

View File

@@ -33,9 +33,7 @@ var (
},
"armv8-a-branchprot": []string{
"-march=armv8-a",
// Disable BTI until drm vendors stop using OS libraries as sources
// of gadgets (https://issuetracker.google.com/216395195).
"-mbranch-protection=pac-ret",
"-mbranch-protection=standard",
},
"armv8-2a": []string{
"-march=armv8.2-a",