Delete deprecated hash mismatch flag in ZipFilterAction

PiperOrigin-RevId: 761615259
Change-Id: I354d3bb5e8b60ba63ec72107a1a00fa93f066960

Author: ted-xie

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

@@ -133,26 +133,6 @@ static class Options {
               + "same name are different."
     )
     HashMismatchCheckMode hashMismatchCheckMode = HashMismatchCheckMode.WARN;
-
-    /**
-     * @deprecated please use --checkHashMismatch ERROR instead. Other options are IGNORE and WARN.
-     */
-    @Deprecated
-    @Parameter(
-      names = "--errorOnHashMismatch",
-      description = "Error on entry filter with hash mismatch."
-    )
-    boolean errorOnHashMismatch = false;
-
-    /**
-     * @deprecated please use --checkHashMismatch WARN instead. Other options are IGNORE and WARN.
-     *     <p>This is a hack to support existing users of --noerrorOnHashMismatch. JCommander does
-     *     not support setting boolean flags with "--no", so instead we set the default to false and
-     *     just ignore anyone who passes --noerrorOnHashMismatch.
-     */
-    @Deprecated
-    @Parameter(names = "--noerrorOnHashMismatch")
-    boolean ignored = false;
   }
 
   /** Converts string flags to paths. Public because JCommander invokes this by reflection. */
@@ -247,11 +227,6 @@ static int run(String[] args) throws IOException {
       }
     }
 
-    // TODO(jingwen): Remove --errorOnHashMismatch when Blaze release with --checkHashMismatch
-    // is checked in.
-    if (options.errorOnHashMismatch) {
-      options.hashMismatchCheckMode = HashMismatchCheckMode.ERROR;
-    }
     ZipFilterEntryFilter entryFilter =
         new ZipFilterEntryFilter(
             explicitFilter,

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

@@ -319,14 +319,15 @@ public void testSkipHashMismatchCheck() throws IOException {
     File output = tmp.newFile();
     output.delete();
     Path filter = createZip("foo.java", "bar.class");
-    ImmutableList<String> args = ImmutableList.of(
-        "--inputZip", input.toFile().getPath(),
-        "--outputZip", output.getPath(),
-        "--filterZips", filter.toFile().getPath(),
-        "--filterTypes", ".class",
-        "--explicitFilters", "bar\\.class",
-        "--outputMode", "DONT_CARE",
-        "--errorOnHashMismatch");
+    ImmutableList<String> args =
+        ImmutableList.of(
+            "--inputZip", input.toFile().getPath(),
+            "--outputZip", output.getPath(),
+            "--filterZips", filter.toFile().getPath(),
+            "--filterTypes", ".class",
+            "--explicitFilters", "bar\\.class",
+            "--outputMode", "DONT_CARE",
+            "--checkHashMismatch", "ERROR");
     assertThat(outputEntriesWithArgs(args, output)).containsExactly("foo.java", "baz.class");
   }