commit 64ffc098a23a4d72726e2efbf590cb8002abeec2
author Ben Lee <ben@ben.cm> Mon Oct 25 13:26:34 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Oct 25 13:28:06 2021 -0700
tree 5fcafb8db8b8d4aed5984f1634ac4d86b8d5e413
parent 10e589686f1b25566c5012adc3433c3780468934

Make AarGeneratorAction worker compatible

AarGeneratorAction isn't currently worker compatible even though the `ResourceProcessorBusyBox` action supports the `supports-workers` execution requirements.

Closes #14144.

PiperOrigin-RevId: 405477763

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

diff --git a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
index 939dfaf..b277fdc 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
@@ -159,7 +159,7 @@
     public boolean throwOnResourceConflict;
   }
 
-  public static void main(String[] args) {
+  public static void main(String[] args) throws IOException {
     Stopwatch timer = Stopwatch.createStarted();
     OptionsParser optionsParser =
         OptionsParser.builder()
@@ -205,12 +205,11 @@
           String.format("Packaging finished at %dms", timer.elapsed(TimeUnit.MILLISECONDS)));
     } catch (MergeConflictException e) {
       logger.log(Level.SEVERE, e.getMessage());
-      System.exit(1);
+      throw e;
     } catch (IOException | MergingException e) {
       logger.log(Level.SEVERE, "Error during merging resources", e);
-      System.exit(1);
+      throw e;
     }
-    System.exit(0);
   }
 
   @VisibleForTesting