Merge "Rename output stubs jar file in java_api_library" (ece6a80b) · Commits · e / os / android_build_soong

java/java.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -1776,7 +1776,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()

+4 −4

Original line number	Diff line number	Diff line
		@@ -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 {