diff --git a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java index 4d91397c703dd7..58bf31fe1e16a7 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java @@ -231,11 +231,6 @@ public static void main(String[] args) throws Exception { // to the expected location of the output. Files.copy(manifest, options.manifestOutput, StandardCopyOption.REPLACE_EXISTING); } - } catch (AndroidManifestProcessor.ManifestProcessingException e) { - // We special case ManifestProcessingExceptions here to indicate that this is - // caused by a build error, not an Bazel-internal error. - logger.log(SEVERE, "Error during merging manifests", e); - System.exit(1); // Don't duplicate the error to the user or bubble up the exception. } catch (Exception e) { logger.log(SEVERE, "Error during merging manifests", e); throw e; // This is a proper internal exception, so we bubble it up.