package: also use system provided zip if using JDK v20

larpon · Nov 18, 2023 · 7f4dc05 · 7f4dc05
1 parent 7444147
commit 7f4dc05
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/android/package.v b/android/package.v
@@ -832,7 +832,9 @@ fn package_aab(opt PackageOptions) ! {
 	// com.android.tools.build.bundletool.model.exceptions.CommandExecutionException: File 'base.zip' does not seem to be a valid ZIP file.
 	// ...
 	// Caused by: java.util.zip.ZipException: invalid CEN header (bad signature)
-	if jdk_semantic_version.le(semver.build(1, 8, 0)) {
+	if jdk_semantic_version.le(semver.build(1, 8, 0))
+		|| (jdk_semantic_version.ge(semver.build(20, 0, 0))
+		&& jdk_semantic_version.lt(semver.build(21, 0, 0))) {
 		$if !windows {
 			if opt.verbosity > 1 {
 				println('Working around Java/bundletool/ZIP64 BUG...')