diff options
| author | Jiyong Park <jiyong@google.com> | 2020-05-28 23:46:55 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2020-05-29 14:15:36 +0900 |
| commit | ed50ca8dd8806e957a42751ebac83ebe57805ab8 (patch) | |
| tree | 32d64dd9defb46a789a07afe421770cd62569e81 /java/java.go | |
| parent | 9e0264c3799099d36ad7a393ace2799aa5da6a88 (diff) | |
apex respects stem of java_library modules
apex now respects stem of java_library modules.
As a follow-up we need to suppor the same for other types of modules.
Exempt-From-Owner-Approval: cherry-pick from AOSP
Bug: 157638999
Test: m
Merged-In: Iaf5023020b5440f1ffd4f5414b5a7864655fc22a
(cherry picked from commit a62aa2399031a01620775a06dbae53af0cff5a25)
Change-Id: Iaf5023020b5440f1ffd4f5414b5a7864655fc22a
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 81f98c0d5..c30dc4e50 100644 --- a/java/java.go +++ b/java/java.go @@ -1880,7 +1880,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 @@ -2721,7 +2721,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 { |