Always do zipalign with uncompressDex.

Also preserve the alignment with hiddenapi.

Test: conscrypt apex has its conscrypt.jar zipaligned.
Change-Id: I43cc0eadb9548c3d8055e12c077fb7bbe1935fe6
This commit is contained in:
Nicolas Geoffray
2019-01-21 23:20:23 +00:00
parent e153382e17
commit 65fd8ba2fe
3 changed files with 15 additions and 8 deletions

View File

@@ -215,6 +215,11 @@ func (j *Module) compileDex(ctx android.ModuleContext, flags javaBuilderFlags,
},
})
}
if j.deviceProperties.UncompressDex {
alignedJavalibJar := android.PathForModuleOut(ctx, "aligned", jarName)
TransformZipAlign(ctx, alignedJavalibJar, javalibJar)
javalibJar = alignedJavalibJar
}
return javalibJar
}