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
diff --git a/android/defaults.go b/android/defaults.go
index df1409e..0776405 100644
--- a/android/defaults.go
+++ b/android/defaults.go
@@ -50,14 +50,11 @@
var _ Defaultable = (*DefaultableModule)(nil)
-func InitDefaultableModule(module Module, d Defaultable,
- props ...interface{}) (blueprint.Module, []interface{}) {
+func InitDefaultableModule(module Module, d Defaultable) {
- d.setProperties(props)
+ d.setProperties(module.GetProperties())
- props = append(props, d.defaults())
-
- return module, props
+ module.AddProperties(d.defaults())
}
type DefaultsModule struct {
@@ -79,21 +76,18 @@
return d.defaultableProperties
}
-func InitDefaultsModule(module Module, d Defaults, props ...interface{}) (blueprint.Module, []interface{}) {
- props = append(props,
+func InitDefaultsModule(module Module, d Defaults) {
+ module.AddProperties(
&hostAndDeviceProperties{},
&commonProperties{},
&variableProperties{})
- _, props = InitArchModule(module, props...)
+ InitArchModule(module)
+ InitDefaultableModule(module, d)
- _, props = InitDefaultableModule(module, d, props...)
-
- props = append(props, &module.base().nameProperties)
+ module.AddProperties(&module.base().nameProperties)
module.base().module = module
-
- return module, props
}
var _ Defaults = (*DefaultsModule)(nil)