diff options
| author | 2023-03-01 00:27:32 +0000 | |
|---|---|---|
| committer | 2023-03-01 01:11:18 +0000 | |
| commit | 25857f5f42b507c0a43ead9150fb880cdee7f24e (patch) | |
| tree | a9b8aa02782e6b95aa12f151103fe398079370f3 /java/java_test.go | |
| parent | 7ba7b46fce25a1c71ff75d9ed7ee22d37d9e854b (diff) | |
Rename output stubs jar file in java_api_library
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
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
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 { |