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

Merge "Fix: recovery module is disabled on 32-bit targets"

Browse Source
This commit is contained in:
Treehugger Robot
2018-07-10 01:36:42 +00:00
committed by Gerrit Code Review
parent 93bb483ce2 8d52f86baf
commit bdf16ec5b2
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -576,6 +576,10 @@ func (c *config) DevicePrefer32BitExecutables() bool {
return Bool(c.productVariables.DevicePrefer32BitExecutables) return Bool(c.productVariables.DevicePrefer32BitExecutables)
} }
func (c *config) DevicePrimaryArchType() ArchType {
return c.Targets[Device][0].Arch.ArchType
}
func (c *config) SkipDeviceInstall() bool { func (c *config) SkipDeviceInstall() bool {
return c.EmbeddedInMake() return c.EmbeddedInMake()
} }

22
cc/cc.go
View File

@@ -1570,14 +1570,9 @@ func imageMutator(mctx android.BottomUpMutatorContext) {
} }
if recoveryVariantNeeded { if recoveryVariantNeeded {
var recoveryMultilib string primaryArch := mctx.Config().DevicePrimaryArchType()
if mctx.Config().DevicePrefer32BitExecutables() { moduleArch := genrule.Target().Arch.ArchType
recoveryMultilib = "lib32" if moduleArch != primaryArch {
} else {
recoveryMultilib = "lib64"
}
multilib := genrule.Target().Arch.ArchType.Multilib
if multilib != recoveryMultilib {
recoveryVariantNeeded = false recoveryVariantNeeded = false
} }
} }
@@ -1690,14 +1685,9 @@ func imageMutator(mctx android.BottomUpMutatorContext) {
} }
if recoveryVariantNeeded { if recoveryVariantNeeded {
var recoveryMultilib string primaryArch := mctx.Config().DevicePrimaryArchType()
if mctx.Config().DevicePrefer32BitExecutables() { moduleArch := m.Target().Arch.ArchType
recoveryMultilib = "lib32" if moduleArch != primaryArch {
} else {
recoveryMultilib = "lib64"
}
multilib := m.Target().Arch.ArchType.Multilib
if multilib != recoveryMultilib {
recoveryVariantNeeded = false recoveryVariantNeeded = false
} }
} }