diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-29 00:56:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-29 00:56:45 +0000 |
| commit | 3013ea064fa7a87e4588b3693dd6268630051784 (patch) | |
| tree | d8dbd4a3fdf570b50055c5fd58dc5efe04e3bcce /java/java.go | |
| parent | 45f0028d133bdb806fbf2150db52f0ea26b30f63 (diff) | |
| parent | 00f5701ade58dd4b9f6e7cfb5d9254bf32aa5616 (diff) | |
Merge "apex respects stem of java_library modules" am: 00f5701ade
Change-Id: I6b6ebf0dbfe5c0ff6a63339bc1c8180b1aa89fcd
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 466132e1e..032aee610 100644 --- a/java/java.go +++ b/java/java.go @@ -1878,7 +1878,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { extraInstallDeps = j.InstallMixin(ctx, j.outputFile) } j.installFile = ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"), - ctx.ModuleName()+".jar", j.outputFile, extraInstallDeps...) + j.Stem()+".jar", j.outputFile, extraInstallDeps...) } // Verify Dist.Tag is set to a supported output @@ -2728,7 +2728,7 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.maybeStrippedDexJarFile = dexOutputFile ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"), - ctx.ModuleName()+".jar", dexOutputFile) + j.Stem()+".jar", dexOutputFile) } func (j *DexImport) DexJar() android.Path { |