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/phony/phony.go b/phony/phony.go
index c405af8..79f3a1b 100644
--- a/phony/phony.go
+++ b/phony/phony.go
@@ -19,8 +19,6 @@
"io"
"strings"
- "github.com/google/blueprint"
-
"android/soong/android"
)
@@ -33,10 +31,11 @@
requiredModuleNames []string
}
-func phonyFactory() (blueprint.Module, []interface{}) {
+func phonyFactory() android.Module {
module := &phony{}
- return android.InitAndroidModule(module)
+ android.InitAndroidModule(module)
+ return module
}
func (p *phony) DepsMutator(ctx android.BottomUpMutatorContext) {