diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-07-10 01:36:42 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-10 01:36:42 +0000 |
commit | bdf16ec5b246952a81c9ed740dae894a534bb9de (patch) | |
tree | afbd7b16b24957a53b5211668523b90c99a98511 | |
parent | 93bb483ce28e2dc37585d6c44a88b63275546bea (diff) | |
parent | 8d52f86bafb73cbef44e830222cd45607d7d2f46 (diff) | |
download | build_soong-bdf16ec5b246952a81c9ed740dae894a534bb9de.tar.gz build_soong-bdf16ec5b246952a81c9ed740dae894a534bb9de.tar.bz2 build_soong-bdf16ec5b246952a81c9ed740dae894a534bb9de.zip |
Merge "Fix: recovery module is disabled on 32-bit targets"
-rw-r--r-- | android/config.go | 4 | ||||
-rw-r--r-- | cc/cc.go | 22 |
2 files changed, 10 insertions, 16 deletions
diff --git a/android/config.go b/android/config.go index 3a9b98b3..7ba05c1b 100644 --- a/android/config.go +++ b/android/config.go @@ -576,6 +576,10 @@ func (c *config) DevicePrefer32BitExecutables() bool { return Bool(c.productVariables.DevicePrefer32BitExecutables) } +func (c *config) DevicePrimaryArchType() ArchType { + return c.Targets[Device][0].Arch.ArchType +} + func (c *config) SkipDeviceInstall() bool { return c.EmbeddedInMake() } @@ -1570,14 +1570,9 @@ func imageMutator(mctx android.BottomUpMutatorContext) { } if recoveryVariantNeeded { - var recoveryMultilib string - if mctx.Config().DevicePrefer32BitExecutables() { - recoveryMultilib = "lib32" - } else { - recoveryMultilib = "lib64" - } - multilib := genrule.Target().Arch.ArchType.Multilib - if multilib != recoveryMultilib { + primaryArch := mctx.Config().DevicePrimaryArchType() + moduleArch := genrule.Target().Arch.ArchType + if moduleArch != primaryArch { recoveryVariantNeeded = false } } @@ -1690,14 +1685,9 @@ func imageMutator(mctx android.BottomUpMutatorContext) { } if recoveryVariantNeeded { - var recoveryMultilib string - if mctx.Config().DevicePrefer32BitExecutables() { - recoveryMultilib = "lib32" - } else { - recoveryMultilib = "lib64" - } - multilib := m.Target().Arch.ArchType.Multilib - if multilib != recoveryMultilib { + primaryArch := mctx.Config().DevicePrimaryArchType() + moduleArch := m.Target().Arch.ArchType + if moduleArch != primaryArch { recoveryVariantNeeded = false } } |