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

Rename output stubs jar file in java_api_library

Browse Source 
When generating framework.aidl, `android_*_stubs_current` are converted
to .aidl files (and created as targets) by replacing the extension from
`.jar` to `.aidl`.
Thus, when replacing `android_*_stubs_current` to java_api_library
modules, generating `android.jar` files leads to ninja error(multiple
rules for generating */android.aidl error).
Prevent this error by renaming the name of the artifact jar file as the
module name so that distinct-named ninja targets can be created.

Test: m
Change-Id: Iaa7248996d7bf5e7f98e1d1e2919870c3cccf5a6
This commit is contained in:
Jihoon Kang
2023-03-01 00:27:32 +00:00
parent 7ba7b46fce
commit 25857f5f42
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java_test.go
View File

@@ -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 {