diff options
| author | 2020-05-29 00:45:03 +0000 | |
|---|---|---|
| committer | 2020-05-29 00:45:03 +0000 | |
| commit | 00f5701ade58dd4b9f6e7cfb5d9254bf32aa5616 (patch) | |
| tree | d8dbd4a3fdf570b50055c5fd58dc5efe04e3bcce /java/java.go | |
| parent | 1b2bae1ba518f74eccc129a37ece7d44825d7384 (diff) | |
| parent | a62aa2399031a01620775a06dbae53af0cff5a25 (diff) | |
Merge "apex respects stem of java_library modules"
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 { |