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

Refactor factories

Browse Source 
Change module factories from returning a blueprint.Module and a list
of property structs to returning an android.Module, which holds the
list of property structs.

Test: build.ninja identical except for Factory: comment lines
Change-Id: Ica1d823f009db812c518f271a386fbff39c9766f
This commit is contained in:
Colin Cross
2017-06-23 15:06:31 -07:00
parent 4817389148
commit 36242850fd
29 changed files with 211 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
cc/cc.go
View File

@@ -304,36 +304,38 @@ type Module struct {
flags Flags
}
func (c *Module) Init() (blueprint.Module, []interface{}) {
props := []interface{}{&c.Properties, &c.unused}
func (c *Module) Init() android.Module {
c.AddProperties(&c.Properties, &c.unused)
if c.compiler != nil {
props = append(props, c.compiler.compilerProps()...)
c.AddProperties(c.compiler.compilerProps()...)
}
if c.linker != nil {
props = append(props, c.linker.linkerProps()...)
c.AddProperties(c.linker.linkerProps()...)
}
if c.installer != nil {
props = append(props, c.installer.installerProps()...)
c.AddProperties(c.installer.installerProps()...)
}
if c.stl != nil {
props = append(props, c.stl.props()...)
c.AddProperties(c.stl.props()...)
}
if c.sanitize != nil {
props = append(props, c.sanitize.props()...)
c.AddProperties(c.sanitize.props()...)
}
if c.coverage != nil {
props = append(props, c.coverage.props()...)
c.AddProperties(c.coverage.props()...)
}
if c.sabi != nil {
props = append(props, c.sabi.props()...)
c.AddProperties(c.sabi.props()...)
}
for _, feature := range c.features {
props = append(props, feature.props()...)
c.AddProperties(feature.props()...)
}
_, props = android.InitAndroidArchModule(c, c.hod, c.multilib, props...)
android.InitAndroidArchModule(c, c.hod, c.multilib)
return android.InitDefaultableModule(c, c, props...)
android.InitDefaultableModule(c, c)
return c
}
// Returns true for dependency roots (binaries)
@@ -1108,14 +1110,15 @@ func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
func (d *Defaults) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func defaultsFactory() (blueprint.Module, []interface{}) {
func defaultsFactory() android.Module {
return DefaultsFactory()
}
func DefaultsFactory(props ...interface{}) (blueprint.Module, []interface{}) {
func DefaultsFactory(props ...interface{}) android.Module {
module := &Defaults{}
props = append(props,
module.AddProperties(props...)
module.AddProperties(
&BaseProperties{},
&BaseCompilerProperties{},
&BaseLinkerProperties{},
@@ -1134,7 +1137,9 @@ func DefaultsFactory(props ...interface{}) (blueprint.Module, []interface{}) {
&SAbiProperties{},
)
return android.InitDefaultsModule(module, module, props...)
android.InitDefaultsModule(module, module)
return module
}
const (