StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support 64-bit arm_on_x86_64" am: 1eda2bd946 am: 524b468a25 am: 2b9c2fce9a

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

Change-Id: I4b4b7075389f3e33ce2e8719fc3263848bcad333
This commit is contained in:
Lev Rumyantsev
2021-10-13 20:36:31 +00:00
committed by Automerger Merge Worker
parent ebb0afdb18 2b9c2fce9a
commit 4c005364c3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/arch.go
View File

@@ -1587,10 +1587,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
}
}