Merge "Refactor module registration"android-o-preview-4

2 files changed, 10 insertions, 10 deletions

diff --git a/soong/llvm.go b/soong/llvm.go
index ac096e6ff452..7ff99bdb6798 100644
--- a/soong/llvm.go
+++ b/soong/llvm.go
@@ -18,7 +18,6 @@ import (
 	"android/soong/android"
 	"android/soong/cc"
 
-	"github.com/google/blueprint"
 	"github.com/google/blueprint/proptools"
 )
 
@@ -102,15 +101,15 @@ func init() {
 	android.RegisterModuleType("force_build_llvm_components_defaults", forceBuildLlvmComponentsDefaultsFactory)
 }
 
-func llvmDefaultsFactory() (blueprint.Module, []interface{}) {
-	module, props := cc.DefaultsFactory()
+func llvmDefaultsFactory() android.Module {
+	module := cc.DefaultsFactory()
 	android.AddLoadHook(module, llvmDefaults)
 
-	return module, props
+	return module
 }
 
-func forceBuildLlvmComponentsDefaultsFactory() (blueprint.Module, []interface{}) {
-	module, props := cc.DefaultsFactory()
+func forceBuildLlvmComponentsDefaultsFactory() android.Module {
+	module := cc.DefaultsFactory()
 	android.AddLoadHook(module, forceBuildLlvmComponents)
-	return module, props
+	return module
 }
diff --git a/soong/tblgen.go b/soong/tblgen.go
index aee3240e3dc4..ac7a34389066 100644
--- a/soong/tblgen.go
+++ b/soong/tblgen.go
@@ -147,8 +147,9 @@ func (t *tblgen) GeneratedSourceFiles() android.Paths {
 	return t.generatedHeaders
 }
 
-func llvmTblgenFactory() (blueprint.Module, []interface{}) {
+func llvmTblgenFactory() android.Module {
 	t := &tblgen{}
-
-	return android.InitAndroidModule(t, &t.properties)
+	t.AddProperties(&t.properties)
+	android.InitAndroidModule(t)
+	return t
 }