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/prebuilt_test.go b/android/prebuilt_test.go
index d09518b..5fa2032 100644
--- a/android/prebuilt_test.go
+++ b/android/prebuilt_test.go
@@ -123,8 +123,8 @@
for _, test := range prebuiltsTests {
t.Run(test.name, func(t *testing.T) {
ctx := NewContext()
- ctx.RegisterModuleType("prebuilt", newPrebuiltModule)
- ctx.RegisterModuleType("source", newSourceModule)
+ ctx.RegisterModuleType("prebuilt", ModuleFactoryAdaptor(newPrebuiltModule))
+ ctx.RegisterModuleType("source", ModuleFactoryAdaptor(newSourceModule))
ctx.MockFileSystem(map[string][]byte{
"Blueprints": []byte(`
source {
@@ -183,9 +183,11 @@
prebuilt Prebuilt
}
-func newPrebuiltModule() (blueprint.Module, []interface{}) {
+func newPrebuiltModule() Module {
m := &prebuiltModule{}
- return InitAndroidModule(m, &m.prebuilt.Properties)
+ m.AddProperties(&m.prebuilt.Properties)
+ InitAndroidModule(m)
+ return m
}
func (p *prebuiltModule) Name() string {
@@ -210,9 +212,11 @@
dependsOnSourceModule, dependsOnPrebuiltModule bool
}
-func newSourceModule() (blueprint.Module, []interface{}) {
+func newSourceModule() Module {
m := &sourceModule{}
- return InitAndroidModule(m, &m.properties)
+ m.AddProperties(&m.properties)
+ InitAndroidModule(m)
+ return m
}
func (s *sourceModule) DepsMutator(ctx BottomUpMutatorContext) {