From 36242850fdad11b4e6fbe061ef30f62e7e8c08d8 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 23 Jun 2017 15:06:31 -0700 Subject: 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 --- python/python.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'python/python.go') diff --git a/python/python.go b/python/python.go index ab80e4d2b..df5999d8a 100644 --- a/python/python.go +++ b/python/python.go @@ -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. -- cgit v1.2.3-59-g8ed1b