From 4735766ef80518fca4ee4788efff81dce271b45b Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 5 Dec 2019 14:07:14 +0000 Subject: [PATCH] Cleanup java.DefaultsFactory() This function took a props varargs parameter but it was only ever called with no parameters. The props parameter meant it could not be used directly with RegisterModuleType() so the defaultsFactory() func was added which simply called through to DefaultsFactory(). Removing the props varargs parameter allowed it to be used directly with RegisterModuleType() and so the defaultsFactory() could be removed. This was needed because a follow up change adds a test in another package that uses java_defaults and so it needs the factory method (defaultsFactory()) to be exported. Test: m nothing Change-Id: I33d5c4d4ce8f349b1e6fc706d5e9656faf303b4f --- java/java.go | 5 ++--- java/java_test.go | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/java/java.go b/java/java.go index cdc1c5575..a074f3680 100644 --- a/java/java.go +++ b/java/java.go @@ -34,7 +34,7 @@ import ( ) func init() { - android.RegisterModuleType("java_defaults", defaultsFactory) + android.RegisterModuleType("java_defaults", DefaultsFactory) android.RegisterModuleType("java_library", LibraryFactory) android.RegisterModuleType("java_library_static", LibraryStaticFactory) @@ -2452,10 +2452,9 @@ func defaultsFactory() android.Module { return DefaultsFactory() } -func DefaultsFactory(props ...interface{}) android.Module { +func DefaultsFactory() android.Module { module := &Defaults{} - module.AddProperties(props...) module.AddProperties( &CompilerProperties{}, &CompilerDeviceProperties{}, diff --git a/java/java_test.go b/java/java_test.go index dc498a492..690ddd76d 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -79,7 +79,7 @@ func testContext(bp string, fs map[string][]byte) *android.TestContext { 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)