Merge "Make boot classpath jars in apexes uncompressed."

This commit is contained in:
Nicolas Geoffray 2019-01-25 12:10:33 +00:00 committed by Gerrit Code Review
commit d15d614214
1 changed files with 3 additions and 3 deletions

View File

@ -1421,10 +1421,10 @@ type Library struct {
} }
func (j *Library) shouldUncompressDex(ctx android.ModuleContext) bool { func (j *Library) shouldUncompressDex(ctx android.ModuleContext) bool {
// Store uncompressed (and do not strip) dex files from boot class path jars that are not // Store uncompressed (and do not strip) dex files from boot class path jars that are
// part of the boot image. // in an apex.
if inList(ctx.ModuleName(), ctx.Config().BootJars()) && if inList(ctx.ModuleName(), ctx.Config().BootJars()) &&
!inList(ctx.ModuleName(), ctx.Config().PreoptBootJars()) { android.DirectlyInAnyApex(ctx, ctx.ModuleName()) {
return true return true
} }
return false return false