From cd964b3ea12e42da8c9886d98a786b9c7c7c9dd7 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 18 Jan 2019 22:03:02 -0800
Subject: Maintain uncompressed dex through hiddenapi encode

hiddenapi encode unzips and rezips the dex jar.  Pass uncompressDex
into it so that it doesn't make classes.dex compressed in the dex
jar when it was previously uncompressed.

Bug: 123100239
Test: m checkbuild
Test: zipinfo $OUT/system/framework/conscrypt.jar shows uncompressed classes.dex
Change-Id: If36cde330eb0bcb1e1db3c582452c5faebc8ff29
---
 java/java.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/java.go')

diff --git a/java/java.go b/java/java.go
index 209d0a703..9c4bd869e 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1188,7 +1188,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
 			}
 			if isBootJar {
 				hiddenAPIJar := android.PathForModuleOut(ctx, "hiddenapi", jarName)
-				hiddenAPIEncodeDex(ctx, hiddenAPIJar, dexOutputFile)
+				hiddenAPIEncodeDex(ctx, hiddenAPIJar, dexOutputFile, j.deviceProperties.UncompressDex)
 				dexOutputFile = hiddenAPIJar
 			}
 		}
-- 
cgit v1.2.3-59-g8ed1b