Refactor factories

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

View File

@@ -152,14 +152,15 @@ var _ PythonDependency = (*pythonBaseModule)(nil)
var _ android.AndroidMkDataProvider = (*pythonBaseModule)(nil)
func InitPythonBaseModule(baseModule *pythonBaseModule, subModule PythonSubModule,
hod android.HostOrDeviceSupported,
props ...interface{}) (blueprint.Module, []interface{}) {
hod android.HostOrDeviceSupported) android.Module {
baseModule.subModule = subModule
props = append(props, &baseModule.properties)
baseModule.AddProperties(&baseModule.properties)
return android.InitAndroidArchModule(baseModule, hod, android.MultilibCommon, props...)
android.InitAndroidArchModule(baseModule, hod, android.MultilibCommon)
return baseModule
}
// the tag used to mark dependencies within "py_libs" attribute.