Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 667039f4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Cleanup java.DefaultsFactory()"

parents 8cda6d93 4735766e

java/java.go

+2 −3
Original line number Diff line number Diff line
@@ -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{},

java/java_test.go

+1 −1
Original line number Diff line number Diff line
@@ -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)