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

Merge "Don't check ABIs in SecondArchIsTranslated"

Browse Source 
am: 98690957d0

Change-Id: Id8785e6aea57c6f97695e420e283514f3a39ff4d
This commit is contained in:
Colin Cross
2019-02-19 22:15:59 -08:00
committed by android-build-merger
parent 38bda6ed46 98690957d0
commit 84d6594f99
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/config.go
View File

@@ -948,6 +948,8 @@ func findOverrideValue(overrides []string, name string, errorMsg string) (newVal
return "", false 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 { func (c *config) SecondArchIsTranslated() bool {
deviceTargets := c.Targets[Android] deviceTargets := c.Targets[Android]
if len(deviceTargets) < 2 { if len(deviceTargets) < 2 {
@@ -956,8 +958,7 @@ func (c *config) SecondArchIsTranslated() bool {
arch := deviceTargets[0].Arch arch := deviceTargets[0].Arch
return (arch.ArchType == X86 || arch.ArchType == X86_64) && return (arch.ArchType == X86 || arch.ArchType == X86_64) && hasArmAndroidArch(deviceTargets)
(hasArmAbi(arch) || hasArmAndroidArch(deviceTargets))
} }
func (c *config) IntegerOverflowDisabledForPath(path string) bool { func (c *config) IntegerOverflowDisabledForPath(path string) bool {