commit 8cdd9f59ffb6bae793e50c7cfdb23e9eac0703c7
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 30 21:09:12 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 30 21:09:12 2017 +0000
tree bb3581fd21c2a064fa002b2b2e28b971d757bdc9
parent 39ca5a2e95704a9df57c0ee33a6b06f625acd7d7
parent 92b9f9b6912208f22554e87515abf72e4abd5c65

Merge "Refactor module registration"

soong/llvm.go

diff --git a/soong/llvm.go b/soong/llvm.go
index ac096e6..7ff99bd 100644
--- a/soong/llvm.go
+++ b/soong/llvm.go
@@ -18,7 +18,6 @@
 	"android/soong/android"
 	"android/soong/cc"
 
-	"github.com/google/blueprint"
 	"github.com/google/blueprint/proptools"
 )
 
@@ -102,15 +101,15 @@
 	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
 }

soong/tblgen.go

diff --git a/soong/tblgen.go b/soong/tblgen.go
index aee3240..ac7a343 100644
--- a/soong/tblgen.go
+++ b/soong/tblgen.go
@@ -147,8 +147,9 @@
 	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
 }