From 25857f5f42b507c0a43ead9150fb880cdee7f24e Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Wed, 1 Mar 2023 00:27:32 +0000 Subject: 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 --- java/java_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'java/java_test.go') 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 { -- cgit v1.2.3-59-g8ed1b