commit 51d7bfd9a1c71300e0254aca599e3cb2e5df4cce
author Cole Faust <colefaust@google.com> Thu Sep 07 05:31:32 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 07 05:31:32 2023 +0000
tree 12db2727afc7948f1cc810b7c9d9c5a1ae8daf2d
parent d293e28f521f37d4e07c307090e5db829545d774

Revert^2 "Only allow setting presigned without preprocessed on targetSdk < 30"

This reverts commit d293e28f521f37d4e07c307090e5db829545d774.

Reason for revert: The underlying issue was fixed in ag/24685010

Change-Id: I06810d37dba37aa12f9a1e14b0749f1e1eb41136

java/base.go

diff --git a/java/base.go b/java/base.go
index 2c0b3ea..8f48398 100644
--- a/java/base.go
+++ b/java/base.go
@@ -1608,7 +1608,7 @@
 					false, nil, nil)
 				if *j.dexProperties.Uncompress_dex {
 					combinedAlignedJar := android.PathForModuleOut(ctx, "dex-withres-aligned", jarName).OutputPath
-					TransformZipAlign(ctx, combinedAlignedJar, combinedJar)
+					TransformZipAlign(ctx, combinedAlignedJar, combinedJar, nil)
 					dexOutputFile = combinedAlignedJar
 				} else {
 					dexOutputFile = combinedJar