From e8b00d69c04e18ec48177a1fa1c99884170d50c7 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Fri, 21 Dec 2018 15:54:16 +0000 Subject: Preopt: Do not strip non-image boot class path jars. Test: Pixel 2 XL boots. Bug: 119868597 Change-Id: I7bd3b7655aecf1a8c26dd8d4d18d3eec685ece88 --- java/java.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index fa4aee43d..a23835bb8 100644 --- a/java/java.go +++ b/java/java.go @@ -1364,6 +1364,12 @@ 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. + if inList(ctx.ModuleName(), ctx.Config().BootJars()) && + !inList(ctx.ModuleName(), ctx.Config().PreoptBootJars()) { + return true + } return false } -- cgit v1.2.3-59-g8ed1b