aboutsummaryrefslogtreecommitdiffstats
path: root/python/python.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-06-23 15:06:31 -0700
committerColin Cross <ccross@android.com>2017-06-30 21:08:36 +0000
commit36242850fdad11b4e6fbe061ef30f62e7e8c08d8 (patch)
treea3ca380533afd39e733c658560f87effb1ee0a46 /python/python.go
parent48173891485a22c9cab0e48f90a3a23be212f44a (diff)
downloadbuild_soong-36242850fdad11b4e6fbe061ef30f62e7e8c08d8.tar.gz
build_soong-36242850fdad11b4e6fbe061ef30f62e7e8c08d8.tar.bz2
build_soong-36242850fdad11b4e6fbe061ef30f62e7e8c08d8.zip
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
Diffstat (limited to 'python/python.go')
-rw-r--r--python/python.go9
1 files changed, 5 insertions, 4 deletions
diff --git a/python/python.go b/python/python.go
index ab80e4d2..df5999d8 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.