diff options
| -rw-r--r-- | java/java.go | 2 | ||||
| -rw-r--r-- | java/java_test.go | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/java/java.go b/java/java.go index 27b2a6ec6..9c0abdf55 100644 --- a/java/java.go +++ b/java/java.go @@ -1782,7 +1782,7 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { rule.Build("metalava", "metalava merged") compiledStubs := android.PathForModuleOut(ctx, ctx.ModuleName(), "stubs.jar") - al.stubsJar = android.PathForModuleOut(ctx, ctx.ModuleName(), "android.jar") + al.stubsJar = android.PathForModuleOut(ctx, ctx.ModuleName(), fmt.Sprintf("%s.jar", ctx.ModuleName())) var flags javaBuilderFlags flags.javaVersion = getStubsJavaVersion() diff --git a/java/java_test.go b/java/java_test.go index dc42e9e59..05cc23e29 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -2037,11 +2037,11 @@ func TestJavaApiLibraryJarGeneration(t *testing.T) { }{ { moduleName: "bar1", - outputJarName: "bar1/android.jar", + outputJarName: "bar1/bar1.jar", }, { moduleName: "bar2", - outputJarName: "bar2/android.jar", + outputJarName: "bar2/bar2.jar", }, } for _, c := range testcases { @@ -2113,7 +2113,7 @@ func TestJavaApiLibraryLibsLink(t *testing.T) { }, { moduleName: "bar2", - classPathJarNames: []string{"lib1.jar", "lib2.jar", "bar1/android.jar"}, + classPathJarNames: []string{"lib1.jar", "lib2.jar", "bar1/bar1.jar"}, }, } for _, c := range testcases { @@ -2188,7 +2188,7 @@ func TestJavaApiLibraryStaticLibsLink(t *testing.T) { }, { moduleName: "bar2", - staticLibJarNames: []string{"lib1.jar", "lib2.jar", "bar1/android.jar"}, + staticLibJarNames: []string{"lib1.jar", "lib2.jar", "bar1/bar1.jar"}, }, } for _, c := range testcases { |