Align jar file after calling merge-zips when dex is uncompressed.
Noticed this while changing a some dex build rules.
Test: m
Change-Id: I9838e81e0e98be49d34554041a5a942b64259aaa
diff --git a/java/java.go b/java/java.go
index 89b09d1..a76cde5 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1244,7 +1244,13 @@
combinedJar := android.PathForModuleOut(ctx, "dex-withres", jarName)
TransformJarsToJar(ctx, combinedJar, "for dex resources", jars, android.OptionalPath{},
false, nil, nil)
- dexOutputFile = combinedJar
+ if j.deviceProperties.UncompressDex {
+ combinedAlignedJar := android.PathForModuleOut(ctx, "dex-withres-aligned", jarName)
+ TransformZipAlign(ctx, combinedAlignedJar, combinedJar)
+ dexOutputFile = combinedAlignedJar
+ } else {
+ dexOutputFile = combinedJar
+ }
}
j.dexJarFile = dexOutputFile