diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-10 00:00:59 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-10 00:00:59 +0000 |
| commit | a19555eea3131ac6f079c78c78fd73a663c2228b (patch) | |
| tree | 0b1aadb7636deb9ed627406e8d10f16665334718 | |
| parent | 340197f134d9de55a32d7e38d968a082ca3a360e (diff) | |
| parent | dcd0f3ee8a89d62663c308e234e8c3d821c378fc (diff) | |
| download | soong-android12-qpr3-s5-release.tar.gz | |
Snap for 8166750 from dcd0f3ee8a89d62663c308e234e8c3d821c378fc to sc-qpr3-releaseandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-release
Change-Id: I07b98e89427832dd7b443c49bcc124641bc9c33e
| -rw-r--r-- | cc/config/arm64_device.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go index 864fba100..dbc9c38ca 100644 --- 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", |