openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "OverridableModuleBase shouldn't embed ModuleBase." am: 0b4ca8605c 

am: bb8bae641d

Change-Id: I4a21037de5027747eb4ce1dd12e5566dafca98c6
This commit is contained in:
Jaewoong Jung 2019-06-19 15:57:35 -07:00 committed by android-build-merger
parent 02ca6db70e bb8bae641d
commit 57811d450d
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
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() {