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

Use blueprint.EarlyModuleContext

Browse Source 
Make android.EarlyModuleContext wrap blueprint.EarlyModuleContext

Test: m checkbuild
Change-Id: I5e05c4f3dfb177811bc244a5cc2d71f42e47613b
This commit is contained in:
Colin Cross
2020-01-03 15:23:27 -08:00
parent 1184b647d5
commit c34d2329b4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android/module.go
View File

@@ -953,7 +953,7 @@ func (m *ModuleBase) generateModuleTarget(ctx ModuleContext) {
} }
} }
func determineModuleKind(m *ModuleBase, ctx blueprint.BaseModuleContext) moduleKind { func determineModuleKind(m *ModuleBase, ctx blueprint.EarlyModuleContext) moduleKind {
var socSpecific = Bool(m.commonProperties.Vendor) || Bool(m.commonProperties.Proprietary) || Bool(m.commonProperties.Soc_specific) var socSpecific = Bool(m.commonProperties.Vendor) || Bool(m.commonProperties.Proprietary) || Bool(m.commonProperties.Soc_specific)
var deviceSpecific = Bool(m.commonProperties.Device_specific) var deviceSpecific = Bool(m.commonProperties.Device_specific)
var productSpecific = Bool(m.commonProperties.Product_specific) var productSpecific = Bool(m.commonProperties.Product_specific)
@@ -1012,11 +1012,11 @@ func determineModuleKind(m *ModuleBase, ctx blueprint.BaseModuleContext) moduleK
} }
} }
func (m *ModuleBase) earlyModuleContextFactory(ctx blueprint.BaseModuleContext) earlyModuleContext { func (m *ModuleBase) earlyModuleContextFactory(ctx blueprint.EarlyModuleContext) earlyModuleContext {
return earlyModuleContext{ return earlyModuleContext{
BaseModuleContext: ctx, EarlyModuleContext: ctx,
kind: determineModuleKind(m, ctx), kind: determineModuleKind(m, ctx),
config: ctx.Config().(Config), config: ctx.Config().(Config),
} }
} }
@@ -1134,7 +1134,7 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
} }
type earlyModuleContext struct { type earlyModuleContext struct {
blueprint.BaseModuleContext blueprint.EarlyModuleContext
kind moduleKind kind moduleKind
config Config config Config
@@ -1157,12 +1157,12 @@ func (e *earlyModuleContext) GlobFiles(globPattern string, excludes []string) Pa
} }
func (e *earlyModuleContext) Module() Module { func (e *earlyModuleContext) Module() Module {
module, _ := e.BaseModuleContext.Module().(Module) module, _ := e.EarlyModuleContext.Module().(Module)
return module return module
} }
func (e *earlyModuleContext) Config() Config { func (e *earlyModuleContext) Config() Config {
return e.BaseModuleContext.Config().(Config) return e.EarlyModuleContext.Config().(Config)
} }
func (e *earlyModuleContext) AConfig() Config { func (e *earlyModuleContext) AConfig() Config {