diff options
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/java/java_test.go b/java/java_test.go index 572db2f79..6bba29b8e 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -74,7 +74,7 @@ func testContext(config android.Config, bp string, ctx.RegisterModuleType("android_app", android.ModuleFactoryAdaptor(AndroidAppFactory)) ctx.RegisterModuleType("android_library", android.ModuleFactoryAdaptor(AndroidLibraryFactory)) ctx.RegisterModuleType("java_binary_host", android.ModuleFactoryAdaptor(BinaryHostFactory)) - ctx.RegisterModuleType("java_library", android.ModuleFactoryAdaptor(LibraryFactory(true))) + ctx.RegisterModuleType("java_library", android.ModuleFactoryAdaptor(LibraryFactory)) ctx.RegisterModuleType("java_library_host", android.ModuleFactoryAdaptor(LibraryHostFactory)) ctx.RegisterModuleType("java_import", android.ModuleFactoryAdaptor(ImportFactory)) ctx.RegisterModuleType("java_defaults", android.ModuleFactoryAdaptor(defaultsFactory)) @@ -598,14 +598,15 @@ func TestPrebuilts(t *testing.T) { javac := ctx.ModuleForTests("foo", "android_common").Rule("javac") combineJar := ctx.ModuleForTests("foo", "android_common").Description("for javac") + barJar := ctx.ModuleForTests("bar", "android_common").Rule("combineJar").Output + bazJar := ctx.ModuleForTests("baz", "android_common").Rule("combineJar").Output - bar := "a.jar" - if !strings.Contains(javac.Args["classpath"], bar) { - t.Errorf("foo classpath %v does not contain %q", javac.Args["classpath"], bar) + if !strings.Contains(javac.Args["classpath"], barJar.String()) { + t.Errorf("foo classpath %v does not contain %q", javac.Args["classpath"], barJar.String()) } - if len(combineJar.Inputs) != 2 || combineJar.Inputs[1].String() != "b.jar" { - t.Errorf("foo combineJar inputs %v does not contain %q", combineJar.Inputs, "b.jar") + if len(combineJar.Inputs) != 2 || combineJar.Inputs[1].String() != bazJar.String() { + t.Errorf("foo combineJar inputs %v does not contain %q", combineJar.Inputs, bazJar.String()) } } |