Make CreateModule take an android.ModuleFactory

Reduce the boilerplate required to call CreateModule by taking an
android.ModuleFactory instead of a blueprint.ModuleFactory.

Test: m checkbuild
Change-Id: I1259d2dd3f7893b5319c333bc180727ac40f9e91
This commit is contained in:
Colin Cross
2019-09-25 11:33:01 -07:00
parent 505bcb88ed
commit 84dfc3d331
5 changed files with 14 additions and 14 deletions

View File

@@ -82,7 +82,7 @@ func createImport(mctx android.TopDownMutatorContext, module string, scope strin
props.Sdk_version = proptools.StringPtr("current")
props.Installable = proptools.BoolPtr(false)
mctx.CreateModule(android.ModuleFactoryAdaptor(ImportFactory), &props)
mctx.CreateModule(ImportFactory, &props)
}
func createFilegroup(mctx android.TopDownMutatorContext, module string, scope string, apiver string, path string) {
@@ -93,7 +93,7 @@ func createFilegroup(mctx android.TopDownMutatorContext, module string, scope st
}{}
filegroupProps.Name = proptools.StringPtr(fgName)
filegroupProps.Srcs = []string{path}
mctx.CreateModule(android.ModuleFactoryAdaptor(android.FileGroupFactory), &filegroupProps)
mctx.CreateModule(android.FileGroupFactory, &filegroupProps)
}
func getPrebuiltFiles(mctx android.TopDownMutatorContext, name string) []string {