commit 667039f404c2455588704a7b04f5de3dbeebb3ee
author Treehugger Robot <treehugger-gerrit@google.com> Sat Dec 07 08:52:21 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 07 08:52:21 2019 +0000
tree 6fa27590ef7b313fe1cf3e99351453e4cf9ded00
parent 8cda6d93de92a364c56eacf2c0ce57f8e80348d1
parent 4735766ef80518fca4ee4788efff81dce271b45b

Merge "Cleanup java.DefaultsFactory()"

java/java.go

diff --git a/java/java.go b/java/java.go
index a9e554b..f933d8d 100644
--- a/java/java.go
+++ b/java/java.go
@@ -34,7 +34,7 @@
 )
 
 func init() {
-	android.RegisterModuleType("java_defaults", defaultsFactory)
+	android.RegisterModuleType("java_defaults", DefaultsFactory)
 
 	android.RegisterModuleType("java_library", LibraryFactory)
 	android.RegisterModuleType("java_library_static", LibraryStaticFactory)
@@ -2451,10 +2451,9 @@
 	return DefaultsFactory()
 }
 
-func DefaultsFactory(props ...interface{}) android.Module {
+func DefaultsFactory() android.Module {
 	module := &Defaults{}
 
-	module.AddProperties(props...)
 	module.AddProperties(
 		&CompilerProperties{},
 		&CompilerDeviceProperties{},

java/java_test.go

diff --git a/java/java_test.go b/java/java_test.go
index bfd80c3..f4b92e3 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -79,7 +79,7 @@
 	ctx.RegisterModuleType("java_test", TestFactory)
 	ctx.RegisterModuleType("java_import", ImportFactory)
 	ctx.RegisterModuleType("java_import_host", ImportFactoryHost)
-	ctx.RegisterModuleType("java_defaults", defaultsFactory)
+	ctx.RegisterModuleType("java_defaults", DefaultsFactory)
 	ctx.RegisterModuleType("java_system_modules", SystemModulesFactory)
 	ctx.RegisterModuleType("java_genrule", genRuleFactory)
 	ctx.RegisterModuleType("java_plugin", PluginFactory)