Don't pass same argument twice for defaults modules initialization
InitDefaultsModule and InitDefaultableModule were requiring the
module to be passed in as an argument twice, once as a
android.Module and once as an android.DefaultableMOdule. Use
a type assertion instead.
Test: builds
Change-Id: I57d721e68a4f016e02c17a678af5f2ba25a9a430
diff --git a/cc/cc.go b/cc/cc.go
index 8fc0ebd..3824a3b 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -275,7 +275,7 @@
// to construct the output file. Behavior can be customized with a Customizer interface
type Module struct {
android.ModuleBase
- android.DefaultableModule
+ android.DefaultableModuleBase
Properties BaseProperties
unused UnusedProperties
@@ -339,7 +339,7 @@
android.InitAndroidArchModule(c, c.hod, c.multilib)
- android.InitDefaultableModule(c, c)
+ android.InitDefaultableModule(c)
return c
}
@@ -1138,7 +1138,7 @@
//
type Defaults struct {
android.ModuleBase
- android.DefaultsModule
+ android.DefaultsModuleBase
}
func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
@@ -1174,7 +1174,7 @@
&SAbiProperties{},
)
- android.InitDefaultsModule(module, module)
+ android.InitDefaultsModule(module)
return module
}