From 5921f75b7cc8b9fc8e7947b65a9cb4f388955bff Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 24 Jan 2019 17:52:04 +0000 Subject: Make boot classpath jars in apexes uncompressed. Save some space on /system by avoiding a copy in the .vdex files. Test: m && /system/framework/boot-*.vdex files doesn't contain dex code. Change-Id: I10cdcfe46a36a49a75f7640e20d065912812ab9f --- java/java.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'java/java.go') 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 -- cgit v1.2.3-59-g8ed1b