diff options
| author | Yimin Li <ymli@google.com> | 2022-04-26 11:30:46 -0700 |
|---|---|---|
| committer | Yimin Li <ymli@google.com> | 2022-04-26 11:30:46 -0700 |
| commit | 9deb18e103632cfe5c094668ed0070a532c08e78 (patch) | |
| tree | 0b1aadb7636deb9ed627406e8d10f16665334718 | |
| parent | ca3328fb3c28ecf5a10a17abda2337ac1733c286 (diff) | |
| parent | a19555eea3131ac6f079c78c78fd73a663c2228b (diff) | |
| download | soong-9deb18e103632cfe5c094668ed0070a532c08e78.tar.gz | |
Merge commit 'a19555eea3131ac6f079c78c78fd73a663c2228b' of sso://googleplex-android/platform/build/soong into HEAD
Change-Id: If83de819e7c590356bb9a85f6166aa3debd1757b
| -rw-r--r-- | android/arch.go | 6 | ||||
| -rw-r--r-- | cc/config/arm64_device.go | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/android/arch.go b/android/arch.go index bb1b61366..6af047c07 100644 --- a/android/arch.go +++ b/android/arch.go @@ -1522,10 +1522,12 @@ func hasArmAbi(arch Arch) bool { return PrefixInList(arch.Abi, "arm") } -// hasArmArch returns true if targets has at least non-native_bridge arm Android arch +// hasArmAndroidArch returns true if targets has at least +// one arm Android arch (possibly native bridged) func hasArmAndroidArch(targets []Target) bool { for _, target := range targets { - if target.Os == Android && target.Arch.ArchType == Arm { + if target.Os == Android && + (target.Arch.ArchType == Arm || target.Arch.ArchType == Arm64) { return true } } 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", |