summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
authorUlyana Trafimovich <skvadrik@google.com>2020-01-29 10:25:33 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-01-29 10:25:33 +0000
commit28e36b14557fedfb93162984195f085ac8632f00 (patch)
tree174d1dd05ebf78303e276fcef0910d21a65b65ae /java/java.go
parent70b0162472dcdeda954bb5d90aa3d7073bfdab8e (diff)
parentf491dde8ea62e8a7e900eec62ff2bce7778a87d6 (diff)
Merge "Store uncompressed and aligned DEX files for java libs in APEXes."
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go
index 794ee681c..ed3dca9e0 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1727,6 +1727,11 @@ type Library struct {
}
func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bool {
+ // Store uncompressed (and aligned) any dex files from jars in APEXes.
+ if am, ok := ctx.Module().(android.ApexModule); ok && !am.IsForPlatform() {
+ return true
+ }
+
// Store uncompressed (and do not strip) dex files from boot class path jars.
if inList(ctx.ModuleName(), ctx.Config().BootJars()) {
return true