From 65fd8ba2fe20907aae20d5200082c82696cb4cb7 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 21 Jan 2019 23:20:23 +0000 Subject: Always do zipalign with uncompressDex. Also preserve the alignment with hiddenapi. Test: conscrypt apex has its conscrypt.jar zipaligned. Change-Id: I43cc0eadb9548c3d8055e12c077fb7bbe1935fe6 --- java/java.go | 6 ------ 1 file changed, 6 deletions(-) (limited to 'java/java.go') 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) } -- cgit v1.2.3-59-g8ed1b