Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34581212 authored by Lev Rumyantsev's avatar Lev Rumyantsev
Browse files

Support 64-bit arm_on_x86_64 

hasArmAndroidArch only checked for 32-bit arm target and thus didn't
work properly on 64-bit only systems.

Test: CtsRsCppTestCases 64-bit only arm on x86
Bug: 194800662
Change-Id: I87332d793dcdd4859766c9067b9fd53f9e4c2516
parent 7b568c1c

android/arch.go

+4 −2
Original line number Diff line number Diff line
@@ -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

		}

	}