Make AndroidCompiledResourceMergingAction worker compatible Calling `System#exit` from within a worker compatible action will shut down unexpectedly. Closes #14424. PiperOrigin-RevId: 419761201
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;