Stop reporting manifest merge errors as exceptions with stack traces as well as printing the merge error report. The stack traces duplicated the error report and gave the impression that the error may be an internal error instead of a build error.

RELNOTES: None.
PiperOrigin-RevId: 162755827

1 files changed, 4 insertions, 1 deletions

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 1862fc238f..2bd9a7756b 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
@@ -18,6 +18,7 @@ import static java.util.logging.Level.SEVERE;
 import com.android.manifmerger.ManifestMerger2.MergeType;
 import com.android.utils.StdLogger;
 import com.google.common.collect.ImmutableMap;
+import com.google.devtools.build.android.AndroidManifestProcessor.MergeErrorException;
 import com.google.devtools.build.android.Converters.ExistingPathConverter;
 import com.google.devtools.build.android.Converters.ExistingPathStringDictionaryConverter;
 import com.google.devtools.build.android.Converters.MergeTypeConverter;
@@ -223,7 +224,9 @@ public class ManifestMergerAction {
 
       // Set to the epoch for caching purposes.
       Files.setLastModifiedTime(options.manifestOutput, FileTime.fromMillis(0L));
-    } catch (IOException e) {
+    } catch (MergeErrorException e) {
+      System.exit(1);
+    } catch (Exception e) {
       logger.log(SEVERE, "Error during merging manifests", e);
       throw e;
     }