diff options
| author | Colin Cross <ccross@android.com> | 2019-01-18 22:03:02 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-01-19 06:10:00 +0000 |
| commit | cd964b3ea12e42da8c9886d98a786b9c7c7c9dd7 (patch) | |
| tree | 4278010d72d2bcc38cbd2b8ad7139ef7b1e46b78 /java/java.go | |
| parent | 6cf8ff918a0e517441c3deff61accd2927ce3765 (diff) | |
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
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 2 |
1 files changed, 1 insertions, 1 deletions
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 } } |