tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "OverridableModuleBase shouldn't embed ModuleBase."

Browse source
This commit is contained in:
Treehugger Robot 2019-06-19 21:30:46 +00:00 committed by Gerrit Code Review
commit 0b4ca8605c
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/override_module.go
View file

@ -95,8 +95,6 @@ type OverridableModule interface {
// Base module struct for overridable module types // Base module struct for overridable module types
type OverridableModuleBase struct { type OverridableModuleBase struct {
ModuleBase
// List of OverrideModules that override this base module // List of OverrideModules that override this base module
overrides []OverrideModule overrides []OverrideModule
// Used to parallelize registerOverrideMutator executions. Note that only addOverride locks this // Used to parallelize registerOverrideMutator executions. Note that only addOverride locks this
@ -144,7 +142,7 @@ func (b *OverridableModuleBase) override(ctx BaseModuleContext, o OverrideModule
// Adds the base module to the overrides property, if exists, of the overriding module. See the // Adds the base module to the overrides property, if exists, of the overriding module. See the
// comment on OverridableModuleBase.overridesProperty for details. // comment on OverridableModuleBase.overridesProperty for details.
if b.overridesProperty != nil { if b.overridesProperty != nil {
*b.overridesProperty = append(*b.overridesProperty, b.Name()) *b.overridesProperty = append(*b.overridesProperty, ctx.ModuleName())
} }
for _, p := range b.overridableProperties { for _, p := range b.overridableProperties {
for _, op := range o.getOverridingProperties() { for _, op := range o.getOverridingProperties() {