diff options
| author | 2019-01-21 23:20:23 +0000 | |
|---|---|---|
| committer | 2019-01-23 06:36:48 +0000 | |
| commit | 65fd8ba2fe20907aae20d5200082c82696cb4cb7 (patch) | |
| tree | 1f75cc983d70181e44433f5746ae8cb727150f65 /java/java.go | |
| parent | e153382e1790d0eadea3fcd6eafcd80004cb4991 (diff) | |
Always do zipalign with uncompressDex.
Also preserve the alignment with hiddenapi.
Test: conscrypt apex has its conscrypt.jar zipaligned.
Change-Id: I43cc0eadb9548c3d8055e12c077fb7bbe1935fe6
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/java/java.go b/java/java.go index f3b47be39..1e5c62867 100644 --- a/java/java.go +++ b/java/java.go @@ -1413,12 +1413,6 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.compile(ctx) if (Bool(j.properties.Installable) || ctx.Host()) && !android.DirectlyInAnyApex(ctx, ctx.ModuleName()) { - if j.deviceProperties.UncompressDex { - alignedOutputFile := android.PathForModuleOut(ctx, "aligned", ctx.ModuleName()+".jar") - TransformZipAlign(ctx, alignedOutputFile, j.outputFile) - j.outputFile = alignedOutputFile - } - j.installFile = ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"), ctx.ModuleName()+".jar", j.outputFile) } |