diff options
| author | 2019-11-20 17:12:35 -0800 | |
|---|---|---|
| committer | 2019-12-17 14:45:11 -0800 | |
| commit | fb0c16e95a559e582911834d4fd7621c012fa831 (patch) | |
| tree | 24d47d6476c4d9c3a387c32b110af5db2c1fefb6 /cc/genrule.go | |
| parent | bd0624304e37a5d602740c1eb3a2a717536e03ce (diff) | |
Move imageMutator before archMutator
Run the imageMutator between osMutator and archMutator so that
different arch variants can be set for the different partitions.
Bug: 142286466
Test: m checkbuild
Change-Id: I65d05714b75aa462bf9816da60fdc2deda4de593
Merged-In: I65d05714b75aa462bf9816da60fdc2deda4de593
(cherry picked from commit 9c8f687584986f6e36ebfdbda22c3cc6c21cf02d)
Diffstat (limited to 'cc/genrule.go')
| -rw-r--r-- | cc/genrule.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cc/genrule.go b/cc/genrule.go index e74dd4d72..b9765a49f 100644 --- a/cc/genrule.go +++ b/cc/genrule.go @@ -59,12 +59,7 @@ func (g *GenruleExtraProperties) CoreVariantNeeded(ctx android.BaseModuleContext } func (g *GenruleExtraProperties) RecoveryVariantNeeded(ctx android.BaseModuleContext) bool { - if Bool(g.Recovery_available) { - primaryArch := ctx.Config().DevicePrimaryArchType() - moduleArch := ctx.Target().Arch.ArchType - return moduleArch == primaryArch - } - return false + return Bool(g.Recovery_available) } func (g *GenruleExtraProperties) ExtraImageVariations(ctx android.BaseModuleContext) []string { |