summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2019-01-09 11:55:30 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-01-09 11:55:30 +0000
commite6092a5e489edc349eec71292219453d3d06d9ea (patch)
tree804a7b8aaf852801bf12b039a3283da99e6ea6ad /java/java.go
parent1976a25692e5c9c19f4dcd86de38d7da9279e3b9 (diff)
parent2fc72f66d06ecaa08b35a206db7fd8f0f2de5c39 (diff)
Merge "Remove duplicated shouldUncompressDex logic"
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go
index 5e67193f0..8b8e4ba50 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1327,6 +1327,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
j.dexJarFile = dexOutputFile
j.dexpreopter.isInstallable = Bool(j.properties.Installable)
+ j.dexpreopter.uncompressedDex = j.deviceProperties.UncompressDex
dexOutputFile = j.dexpreopt(ctx, dexOutputFile)
j.maybeStrippedDexJarFile = dexOutputFile
@@ -1499,9 +1500,14 @@ type Library struct {
Module
}
+func (j *Library) shouldUncompressDex(ctx android.ModuleContext) bool {
+ return false
+}
+
func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.dexpreopter.installPath = android.PathForModuleInstall(ctx, "framework", ctx.ModuleName()+".jar")
j.dexpreopter.isSDKLibrary = j.deviceProperties.IsSDKLibrary
+ j.deviceProperties.UncompressDex = j.shouldUncompressDex(ctx)
j.compile(ctx)
if Bool(j.properties.Installable) || ctx.Host() {