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.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 27b2a6ec6..9c0abdf55 100644 --- a/java/java.go +++ b/java/java.go @@ -1782,7 +1782,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() -- cgit v1.2.3