Merge "Store uncompressed and aligned DEX files for java libs in APEXes." am: 28e36b1455 am: 6a517467aa am: 7bd4aa2853

Change-Id: I204fa801fa92b9603d4adb26f070310bc8b48955
2020-01-29 10:53:52 +00:00
parent 7f208d595d 7bd4aa2853
commit a3e117d183
2 changed files with 6 additions and 1 deletions
--- 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