diff options
author | 2018-04-26 19:48:14 -0700 | |
---|---|---|
committer | 2018-04-26 19:49:50 -0700 | |
commit | a6a9843ddb869d911795bd9a634e725d5952dfb2 (patch) | |
tree | 6c2966bde91ed4f18a89d7fc77a5d9d114333d7b /src/tools/android/java/com/google/devtools/build/android/ZipFilterAction.java | |
parent | 968059d59719d7789b4b3fe97fe0d6be0e86682d (diff) |
For --checkHashMismatch=ERROR, emit all errors instead of stopping at the first one
PiperOrigin-RevId: 194491274
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/ZipFilterAction.java')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/ZipFilterAction.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/ZipFilterAction.java b/src/tools/android/java/com/google/devtools/build/android/ZipFilterAction.java index c774ec22f6..0a0744746d 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ZipFilterAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/ZipFilterAction.java @@ -28,7 +28,6 @@ import com.google.common.collect.ImmutableSetMultimap; 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.singlejar.ZipEntryFilter; import com.google.devtools.build.zip.ZipFileEntry; import com.google.devtools.build.zip.ZipReader; import java.io.IOException; @@ -67,7 +66,7 @@ import java.util.regex.Pattern; * --filterTypes [fileExtension[,fileExtension]...] * --explicitFilters [fileRegex[,fileRegex]...] * --outputMode [DONT_CARE|FORCE_DEFLATE|FORCE_STORED] - * --errorOnHashMismatch + * --checkHashMismatch [IGNORE|WARN|ERROR] * </pre> */ public class ZipFilterAction { @@ -213,6 +212,10 @@ public class ZipFilterAction { } public static void main(String[] args) throws IOException { + System.exit(run(args)); + } + + static int run(String[] args) throws IOException { Options options = new Options(); new JCommander(options).parse(args); logger.fine( @@ -241,7 +244,7 @@ public class ZipFilterAction { if (options.errorOnHashMismatch) { options.hashMismatchCheckMode = HashMismatchCheckMode.ERROR; } - ZipEntryFilter entryFilter = + ZipFilterEntryFilter entryFilter = new ZipFilterEntryFilter( explicitFilter, entriesToOmit, inputEntries.build(), options.hashMismatchCheckMode); @@ -250,5 +253,6 @@ public class ZipFilterAction { combiner.addZip(options.inputZip.toFile()); } logger.fine(String.format("Filtering completed in %dms", timer.elapsed(TimeUnit.MILLISECONDS))); + return entryFilter.sawErrors() ? 1 : 0; } } |