Refactor module registration

Refactor module registration so that it doesn't need to separately
track properties.

Test: builds, no change to out/soong/build.ninja
Change-Id: I4215b710a37f53ea1d5664bb0f7abbd42d25a3e9

diff --git a/build/fluoride.go b/build/fluoride.go
index 951b816..7b9ac97 100644 (file)
--- a/build/fluoride.go
+++ b/build/fluoride.go
@@ -18,19 +18,17 @@ import (
 
        "android/soong/android"
        "android/soong/cc"
-
-       "github.com/google/blueprint"
 )
 
 func init() {
        android.RegisterModuleType("fluoride_defaults", fluorideDefaultsFactory)
 }
 
-func fluorideDefaultsFactory() (blueprint.Module, []interface{}) {
-       module, props := cc.DefaultsFactory()
+func fluorideDefaultsFactory() android.Module {
+       module := cc.DefaultsFactory()
        android.AddLoadHook(module, fluorideDefaults)
 
-       return module, props
+       return module
 }
 
 func fluorideDefaults(ctx android.LoadHookContext) {