Don't use Zip-related classes from Bazel's zip library

Removes another dependency on all_android_tool.jar for OSS rules_android.

PiperOrigin-RevId: 747417644
Change-Id: I5171ced52dce2ee2b2c02f0ceab7e9c410435ff1

Author: ted-xie

src/tools/java/com/google/devtools/build/android/BUILD

@@ -25,20 +25,6 @@ java_binary(
     runtime_deps = [":android_builder_lib"],
 )
 
-run_singlejar(
-    name = "zip_jar_gen",
-    srcs = ["@android_tools//:all_android_tools_deploy.jar"],
-    out = "zip.jar",
-    include_prefixes = [
-        "com/google/devtools/build/zip/",
-    ],
-)
-
-java_import(
-    name = "zip_jar",
-    jars = [":zip_jar_gen"],
-)
-
 run_singlejar(
     name = "singlejar_jar_gen",
     srcs = ["@android_tools//:all_android_tools_deploy.jar"],
@@ -125,7 +111,6 @@ java_library(
         ":dependency_info",
         ":kotlin_jar",
         ":singlejar_jar",
-        ":zip_jar",
         "//src/tools/java/com/google/devtools/build/android/junctions",
         "//src/tools/java/com/google/devtools/build/android/proto:resources_java_proto",
         "//src/tools/java/com/google/devtools/build/android/proto:serialize_format_java_pb",
@@ -151,7 +136,6 @@ java_library(
     ],
     deps = [
         ":android_builder_lib",
-        ":zip_jar",
         "//src/tools/java/com/google/devtools/build/android/r8",
         "//src/tools/java/com/google/devtools/build/android/r8:constants",
         "@rules_android_maven//:com_beust_jcommander",

src/tools/java/com/google/devtools/build/android/DesugarDexShardingAction.java

@@ -27,8 +27,6 @@
 import com.google.devtools.build.android.r8.CompatDexBuilder;
 import com.google.devtools.build.android.r8.Constants;
 import com.google.devtools.build.android.r8.Desugar;
-import com.google.devtools.build.zip.ZipFileEntry;
-import com.google.devtools.build.zip.ZipReader;
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -39,6 +37,7 @@
 import java.nio.file.attribute.FileTime;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
@@ -108,8 +107,10 @@ public static class Options {
   private DesugarDexShardingAction() {}
 
   private static boolean hasCode(Path in) throws IOException {
-    try (ZipReader zip = new ZipReader(in.toFile())) {
-      for (ZipFileEntry entry : zip.entries()) {
+    try (ZipFile zip = new ZipFile(in.toFile())) {
+      Enumeration<? extends ZipEntry> entries = zip.entries();
+      while (entries.hasMoreElements()) {
+        ZipEntry entry = entries.nextElement();
         if (entry.getName().endsWith(".class") || entry.getName().endsWith(".dex")) {
           return true;
         }

src/tools/java/com/google/devtools/build/android/ZipFilterAction.java

@@ -28,20 +28,21 @@
 import com.google.common.collect.Multimap;
 import com.google.devtools.build.singlejar.ZipCombiner;
 import com.google.devtools.build.singlejar.ZipCombiner.OutputMode;
-import com.google.devtools.build.zip.ZipFileEntry;
-import com.google.devtools.build.zip.ZipReader;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
+import java.util.Enumeration;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 /**
  * Action to filter entries out of a Zip file.
@@ -201,8 +202,11 @@ static Multimap<String, Long> getEntriesToOmit(
 
     ImmutableSetMultimap.Builder<String, Long> entriesToOmit = ImmutableSetMultimap.builder();
     for (Path filterZip : filterZips) {
-      try (ZipReader zip = new ZipReader(filterZip.toFile())) {
-        for (ZipFileEntry entry : zip.entries()) {
+      try (ZipFile zf = new ZipFile(filterZip.toFile())) {
+        Enumeration<? extends ZipEntry> entries = zf.entries();
+
+        while (entries.hasMoreElements()) {
+          ZipEntry entry = entries.nextElement();
           if (filterTypes.isEmpty() || filterPattern.matcher(entry.getName()).matches()) {
             entriesToOmit.put(entry.getName(), entry.getCrc());
           }
@@ -234,8 +238,11 @@ static int run(String[] args) throws IOException {
     logger.fine(String.format("Filter created in %dms", timer.elapsed(TimeUnit.MILLISECONDS)));
 
     ImmutableMap.Builder<String, Long> inputEntries = ImmutableMap.builder();
-    try (ZipReader input = new ZipReader(options.inputZip.toFile())) {
-      for (ZipFileEntry entry : input.entries()) {
+    try (ZipFile zf = new ZipFile(options.inputZip.toFile())) {
+      Enumeration<? extends ZipEntry> entries = zf.entries();
+
+      while (entries.hasMoreElements()) {
+        ZipEntry entry = entries.nextElement();
         inputEntries.put(entry.getName(), entry.getCrc());
       }
     }

src/tools/javatests/com/google/devtools/build/android/ZipFilterActionTest.java

@@ -238,7 +238,7 @@ private List<String> outputEntriesWithArgs(ImmutableList<String> args, File outp
             "--outputMode", "DONT_CARE",
             "--checkHashMismatch", "IGNORE");
     thrown.expect(ZipException.class);
-    thrown.expectMessage("Zip file 'filter1' is malformed");
+    thrown.expectMessage("zip file is empty");
     ZipFilterAction.run(args.toArray(new String[0]));
   }