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

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

Change-Id: Id456023beeb4d6e930e60241512a0eeab31c4162
This commit is contained in:
Lev Rumyantsev
2021-10-13 20:06:42 +00:00
committed by Automerger Merge Worker
parent 1f211a9b88 1eda2bd946
commit 524b468a25
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") 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 { func hasArmAndroidArch(targets []Target) bool {
for _, target := range targets { 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 return true
} }
} }