Revert "Never strip and store dex files uncompressed when they are preopted on system."

This reverts commit 4bb0106759a9a84dff4e7b6a6d207097365f8230.

Reason for revert: b/123436620

Change-Id: Ia7595ace4b76abaa99dbb651e7d2f088dec5bad9

1 files changed, 7 insertions, 10 deletions

diff --git a/java/java.go b/java/java.go
index 34e06d63a..3d7d6ad8d 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1239,6 +1239,8 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
 		j.dexJarFile = dexOutputFile
 
 		// Dexpreopting
+		j.dexpreopter.isInstallable = Bool(j.properties.Installable)
+		j.dexpreopter.uncompressedDex = j.deviceProperties.UncompressDex
 		dexOutputFile = j.dexpreopt(ctx, dexOutputFile)
 
 		j.maybeStrippedDexJarFile = dexOutputFile
@@ -1415,13 +1417,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.
-	if inList(ctx.ModuleName(), ctx.Config().BootJars()) {
-		return true
-	}
-
-	// Store uncompressed dex files that are preopted on /system.
-	if !j.dexpreopter.dexpreoptDisabled(ctx) && (ctx.Host() || !odexOnSystemOther(ctx, j.dexpreopter.installPath)) {
+	// 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()) &&
+		android.DirectlyInAnyApex(ctx, ctx.ModuleName()) {
 		return true
 	}
 	if ctx.Config().UncompressPrivAppDex() &&
@@ -1435,9 +1434,7 @@ func (j *Library) shouldUncompressDex(ctx android.ModuleContext) bool {
 func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 	j.dexpreopter.installPath = android.PathForModuleInstall(ctx, "framework", ctx.ModuleName()+".jar")
 	j.dexpreopter.isSDKLibrary = j.deviceProperties.IsSDKLibrary
-	j.dexpreopter.isInstallable = Bool(j.properties.Installable)
-	j.dexpreopter.uncompressedDex = j.shouldUncompressDex(ctx)
-	j.deviceProperties.UncompressDex = j.dexpreopter.uncompressedDex
+	j.deviceProperties.UncompressDex = j.shouldUncompressDex(ctx)
 	j.compile(ctx)
 
 	if (Bool(j.properties.Installable) || ctx.Host()) && !android.DirectlyInAnyApex(ctx, ctx.ModuleName()) {