Always do zipalign with uncompressDex.
Also preserve the alignment with hiddenapi.
Test: conscrypt apex has its conscrypt.jar zipaligned.
Change-Id: I43cc0eadb9548c3d8055e12c077fb7bbe1935fe6
diff --git a/java/dex.go b/java/dex.go
index 2531970..913eee6 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -215,6 +215,11 @@
},
})
}
+ if j.deviceProperties.UncompressDex {
+ alignedJavalibJar := android.PathForModuleOut(ctx, "aligned", jarName)
+ TransformZipAlign(ctx, alignedJavalibJar, javalibJar)
+ javalibJar = alignedJavalibJar
+ }
return javalibJar
}