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

Commit 98690957 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Don't check ABIs in SecondArchIsTranslated"

parents e67c20ce 93a9e5e3

android/config.go

+3 −2
Original line number Diff line number Diff line
@@ -948,6 +948,8 @@ func findOverrideValue(overrides []string, name string, errorMsg string) (newVal 
	return "", false

}



// SecondArchIsTranslated returns true if the primary device arch is X86 or X86_64 and the device also has an arch

// that is Arm or Arm64.

func (c *config) SecondArchIsTranslated() bool {

	deviceTargets := c.Targets[Android]

	if len(deviceTargets) < 2 {
@@ -956,8 +958,7 @@ func (c *config) SecondArchIsTranslated() bool { 


	arch := deviceTargets[0].Arch



	return (arch.ArchType == X86 || arch.ArchType == X86_64) &&

		(hasArmAbi(arch) || hasArmAndroidArch(deviceTargets))

	return (arch.ArchType == X86 || arch.ArchType == X86_64) && hasArmAndroidArch(deviceTargets)

}



func (c *config) IntegerOverflowDisabledForPath(path string) bool {