From b64dd002b35af917f474ffb179e59af8f694c002 Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Fri, 10 Jan 2020 13:26:00 -0800 Subject: [PATCH] Rename OverridableModuleBase.properties. The generic name causes confusion, even to the IDE. Test: TreeHugger Change-Id: I0cb4959ab41b4732e7ee7a5d1d818ef771674023 --- android/override_module.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android/override_module.go b/android/override_module.go index 5bc787b54..9f5127dc3 100644 --- a/android/override_module.go +++ b/android/override_module.go @@ -121,13 +121,13 @@ type OverridableModuleBase struct { // override information is propagated and aggregated correctly. overridesProperty *[]string - properties overridableModuleProperties + overridableModuleProperties overridableModuleProperties } func InitOverridableModule(m OverridableModule, overridesProperty *[]string) { m.setOverridableProperties(m.(Module).GetProperties()) m.setOverridesProperty(overridesProperty) - m.AddProperties(&m.moduleBase().properties) + m.AddProperties(&m.moduleBase().overridableModuleProperties) } func (o *OverridableModuleBase) moduleBase() *OverridableModuleBase { @@ -174,7 +174,7 @@ func (b *OverridableModuleBase) override(ctx BaseModuleContext, o OverrideModule if b.overridesProperty != nil { *b.overridesProperty = append(*b.overridesProperty, ctx.ModuleName()) } - b.properties.OverriddenBy = o.Name() + b.overridableModuleProperties.OverriddenBy = o.Name() } // GetOverriddenBy returns the name of the override module that has overridden this module. @@ -182,7 +182,7 @@ func (b *OverridableModuleBase) override(ctx BaseModuleContext, o OverrideModule // of bar is created and its properties are overriden by foo. This method returns bar when called from // the new local variant. It returns "" when called from the original variant of bar. func (b *OverridableModuleBase) GetOverriddenBy() string { - return b.properties.OverriddenBy + return b.overridableModuleProperties.OverriddenBy } func (b *OverridableModuleBase) OverridablePropertiesDepsMutator(ctx BottomUpMutatorContext) {