diff options
| author | 2019-11-25 22:30:17 +0000 | |
|---|---|---|
| committer | 2019-11-25 22:30:17 +0000 | |
| commit | 09ef474b6f797eb4f81e65b1736be30fbb3dd9cf (patch) | |
| tree | bf03e0eab4434dc6defff90cbe0d0a23e3b78403 /android/mutator.go | |
| parent | 4b49b768a2cb7d455aea5347d27d9045b8c481fa (diff) | |
| parent | 7228ecd5e3c9282e7e6f4a81d81fd333cb08eaff (diff) | |
Merge changes I0dcc9c7b,I9bc40642
* changes:
Move cc.imageMutator into the android package
Make CreateVariations return []android.Module
Diffstat (limited to 'android/mutator.go')
| -rw-r--r-- | android/mutator.go | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/android/mutator.go b/android/mutator.go index df68726d2..0d253eb5c 100644 --- a/android/mutator.go +++ b/android/mutator.go @@ -143,8 +143,8 @@ type BottomUpMutatorContext interface { AddDependency(module blueprint.Module, tag blueprint.DependencyTag, name ...string) AddReverseDependency(module blueprint.Module, tag blueprint.DependencyTag, name string) - CreateVariations(...string) []blueprint.Module - CreateLocalVariations(...string) []blueprint.Module + CreateVariations(...string) []Module + CreateLocalVariations(...string) []Module SetDependencyVariation(string) SetDefaultDependencyVariation(*string) AddVariationDependencies([]blueprint.Variation, blueprint.DependencyTag, ...string) @@ -285,28 +285,32 @@ func (b *bottomUpMutatorContext) AddReverseDependency(module blueprint.Module, t b.bp.AddReverseDependency(module, tag, name) } -func (b *bottomUpMutatorContext) CreateVariations(variations ...string) []blueprint.Module { +func (b *bottomUpMutatorContext) CreateVariations(variations ...string) []Module { modules := b.bp.CreateVariations(variations...) + aModules := make([]Module, len(modules)) for i := range variations { - base := modules[i].(Module).base() + aModules[i] = modules[i].(Module) + base := aModules[i].base() base.commonProperties.DebugMutators = append(base.commonProperties.DebugMutators, b.MutatorName()) base.commonProperties.DebugVariations = append(base.commonProperties.DebugVariations, variations[i]) } - return modules + return aModules } -func (b *bottomUpMutatorContext) CreateLocalVariations(variations ...string) []blueprint.Module { +func (b *bottomUpMutatorContext) CreateLocalVariations(variations ...string) []Module { modules := b.bp.CreateLocalVariations(variations...) + aModules := make([]Module, len(modules)) for i := range variations { - base := modules[i].(Module).base() + aModules[i] = modules[i].(Module) + base := aModules[i].base() base.commonProperties.DebugMutators = append(base.commonProperties.DebugMutators, b.MutatorName()) base.commonProperties.DebugVariations = append(base.commonProperties.DebugVariations, variations[i]) } - return modules + return aModules } func (b *bottomUpMutatorContext) SetDependencyVariation(variation string) { |