StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename output stubs jar file in java_api_library" am: ece6a80b08

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462253

Change-Id: I95c5fff5e04b38b5bdd631ebc24ef6ac289392e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jihoon Kang
2023-03-01 17:45:39 +00:00
committed by Automerger Merge Worker
parent 3d693ce4b4 ece6a80b08
commit 43c72c157a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java.go
View File

@@ -1776,7 +1776,7 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
rule.Build("metalava", "metalava merged") rule.Build("metalava", "metalava merged")
compiledStubs := android.PathForModuleOut(ctx, ctx.ModuleName(), "stubs.jar") 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 var flags javaBuilderFlags
flags.javaVersion = getStubsJavaVersion() flags.javaVersion = getStubsJavaVersion()

8
java/java_test.go
View File

@@ -2037,11 +2037,11 @@ func TestJavaApiLibraryJarGeneration(t *testing.T) {
}{ }{
{ {
moduleName: "bar1", moduleName: "bar1",
outputJarName: "bar1/android.jar", outputJarName: "bar1/bar1.jar",
}, },
{ {
moduleName: "bar2", moduleName: "bar2",
outputJarName: "bar2/android.jar", outputJarName: "bar2/bar2.jar",
}, },
} }
for _, c := range testcases { for _, c := range testcases {
@@ -2113,7 +2113,7 @@ func TestJavaApiLibraryLibsLink(t *testing.T) {
}, },
{ {
moduleName: "bar2", moduleName: "bar2",
classPathJarNames: []string{"lib1.jar", "lib2.jar", "bar1/android.jar"}, classPathJarNames: []string{"lib1.jar", "lib2.jar", "bar1/bar1.jar"},
}, },
} }
for _, c := range testcases { for _, c := range testcases {
@@ -2188,7 +2188,7 @@ func TestJavaApiLibraryStaticLibsLink(t *testing.T) {
}, },
{ {
moduleName: "bar2", moduleName: "bar2",
staticLibJarNames: []string{"lib1.jar", "lib2.jar", "bar1/android.jar"}, staticLibJarNames: []string{"lib1.jar", "lib2.jar", "bar1/bar1.jar"},
}, },
} }
for _, c := range testcases { for _, c := range testcases {