commit 3df19e8e900c0f435923754fee36ca5d6eb8724d
author Benjamin Lee <ben@ben.cm> Wed Jan 05 00:06:33 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Jan 05 00:08:04 2022 -0800
tree 397758993b533eedb40a1f13307fe8771a75e7ac
parent 916353947a522c0431c2a8d1885f743c4d1e1035

Make AndroidCompiledResourceMergingAction worker compatible

Calling `System#exit` from within a worker compatible action will shut down unexpectedly.

Closes #14424.

PiperOrigin-RevId: 419761201

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

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java
index 1677125..a01d284 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java
@@ -259,12 +259,12 @@
       Files.copy(processedManifest, options.manifestOutput);
     } catch (MergeConflictException e) {
       logger.log(Level.SEVERE, e.getMessage());
-      System.exit(1);
+      throw e;
     } catch (MergingException e) {
       logger.log(Level.SEVERE, "Error during merging resources", e);
       throw e;
     } catch (AndroidManifestProcessor.ManifestProcessingException e) {
-      System.exit(1);
+      throw e;
     } catch (Exception e) {
       logger.log(Level.SEVERE, "Unexpected", e);
       throw e;