summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2019-01-25 12:10:33 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-01-25 12:10:33 +0000
commitd15d614214cff74150b7d3bb9cc8277c45e3b322 (patch)
treed47df13a6d953c010ab05b8c4c045ce32ed50ebc /java/java.go
parent7171ffa97f8ba5d38742d2cd93f3c2255831aa2a (diff)
parent5921f75b7cc8b9fc8e7947b65a9cb4f388955bff (diff)
Merge "Make boot classpath jars in apexes uncompressed."
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go
index b070639bd..230e8f2b8 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1421,10 +1421,10 @@ type Library struct {
}
func (j *Library) shouldUncompressDex(ctx android.ModuleContext) bool {
- // Store uncompressed (and do not strip) dex files from boot class path jars that are not
- // part of the boot image.
+ // Store uncompressed (and do not strip) dex files from boot class path jars that are
+ // in an apex.
if inList(ctx.ModuleName(), ctx.Config().BootJars()) &&
- !inList(ctx.ModuleName(), ctx.Config().PreoptBootJars()) {
+ android.DirectlyInAnyApex(ctx, ctx.ModuleName()) {
return true
}
return false