diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-12-21 15:54:16 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2019-01-11 10:26:17 +0000 |
| commit | e8b00d69c04e18ec48177a1fa1c99884170d50c7 (patch) | |
| tree | 99d1ce9fb1ecba0f84ef7dd9d054b24d8bfda8b0 /java/java.go | |
| parent | ae1366f60d2f46d8747fddef40762a7376ab7442 (diff) | |
Preopt: Do not strip non-image boot class path jars.
Test: Pixel 2 XL boots.
Bug: 119868597
Change-Id: I7bd3b7655aecf1a8c26dd8d4d18d3eec685ece88
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 6 |
1 files changed, 6 insertions, 0 deletions
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 } |