Change the BufferedReader to BufferedInputStream, as the UTF-8 bom crashes the BufferedReader.

Add the errors a suppressed exceptions which is more useful for debugging.

--
MOS_MIGRATED_REVID=125609925

1 files changed, 3 insertions, 3 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
index 4e78428b88..15c551f6a5 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
@@ -85,11 +85,11 @@ public class ParsedAndroidData {
 
     private void checkForErrors() throws MergingException {
       if (!errors.isEmpty()) {
-        StringBuilder messageBuilder = new StringBuilder();
+        MergingException mergingException = new MergingException("Parse Error(s)");
         for (Exception e : errors) {
-          messageBuilder.append("\n").append(e.getMessage());
+          mergingException.addSuppressed(e);
         }
-        throw new MergingException(messageBuilder.toString());
+        throw mergingException;
       }
     }