diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-12-07 08:52:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-07 08:52:21 +0000 |
| commit | 667039f404c2455588704a7b04f5de3dbeebb3ee (patch) | |
| tree | 6fa27590ef7b313fe1cf3e99351453e4cf9ded00 /java/java.go | |
| parent | 8cda6d93de92a364c56eacf2c0ce57f8e80348d1 (diff) | |
| parent | 4735766ef80518fca4ee4788efff81dce271b45b (diff) | |
Merge "Cleanup java.DefaultsFactory()"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index a9e554b0c..f933d8dac 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) @@ -2451,10 +2451,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{}, |