StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename OverridableModuleBase.properties."

Browse Source 
am: 5fa3a1f743

Change-Id: I1c6faacbe8cca7c5d617766d22afd0f2333c64d8
This commit is contained in:
Jaewoong Jung
2020-01-10 16:05:18 -08:00
committed by android-build-merger
parent 408fab4d25 5fa3a1f743
commit 1e38e20682
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/override_module.go
View File

@@ -121,13 +121,13 @@ type OverridableModuleBase struct {
// override information is propagated and aggregated correctly. // override information is propagated and aggregated correctly.
overridesProperty *[]string overridesProperty *[]string
properties overridableModuleProperties overridableModuleProperties overridableModuleProperties
} }
func InitOverridableModule(m OverridableModule, overridesProperty *[]string) { func InitOverridableModule(m OverridableModule, overridesProperty *[]string) {
m.setOverridableProperties(m.(Module).GetProperties()) m.setOverridableProperties(m.(Module).GetProperties())
m.setOverridesProperty(overridesProperty) m.setOverridesProperty(overridesProperty)
m.AddProperties(&m.moduleBase().properties) m.AddProperties(&m.moduleBase().overridableModuleProperties)
} }
func (o *OverridableModuleBase) moduleBase() *OverridableModuleBase { func (o *OverridableModuleBase) moduleBase() *OverridableModuleBase {
@@ -174,7 +174,7 @@ func (b *OverridableModuleBase) override(ctx BaseModuleContext, o OverrideModule
if b.overridesProperty != nil { if b.overridesProperty != nil {
*b.overridesProperty = append(*b.overridesProperty, ctx.ModuleName()) *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. // 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 // 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. // the new local variant. It returns "" when called from the original variant of bar.
func (b *OverridableModuleBase) GetOverriddenBy() string { func (b *OverridableModuleBase) GetOverriddenBy() string {
return b.properties.OverriddenBy return b.overridableModuleProperties.OverriddenBy
} }
func (b *OverridableModuleBase) OverridablePropertiesDepsMutator(ctx BottomUpMutatorContext) { func (b *OverridableModuleBase) OverridablePropertiesDepsMutator(ctx BottomUpMutatorContext) {