diff options
| author | 2019-06-19 11:22:25 -0700 | |
|---|---|---|
| committer | 2019-06-19 11:22:25 -0700 | |
| commit | 8985d527ae03bd13c1854e4f2f5088841c8f62f5 (patch) | |
| tree | 1cce626de0fa53bf585bf21e0af3614ac272da05 /android/override_module.go | |
| parent | 72ea641dffd8b6d037d1529ea6946c726a624f14 (diff) | |
OverridableModuleBase shouldn't embed ModuleBase.
Individual module structs normally embed ModuleBase themselves. This
caused duplicate embedding, and so made common properties like notice
inaccessible.
Bug: 135460391
Test: app_test.go, TreeHugger
Change-Id: I5683b194e3de909d480c083a931cc7e871de1d74
Diffstat (limited to 'android/override_module.go')
| -rw-r--r-- | android/override_module.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/android/override_module.go b/android/override_module.go index 5a57c9376..22fb7de44 100644 --- a/android/override_module.go +++ b/android/override_module.go @@ -95,8 +95,6 @@ type OverridableModule interface { // Base module struct for overridable module types type OverridableModuleBase struct { - ModuleBase - // List of OverrideModules that override this base module overrides []OverrideModule // 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 // comment on OverridableModuleBase.overridesProperty for details. if b.overridesProperty != nil { - *b.overridesProperty = append(*b.overridesProperty, b.Name()) + *b.overridesProperty = append(*b.overridesProperty, ctx.ModuleName()) } for _, p := range b.overridableProperties { for _, op := range o.getOverridingProperties() { |