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, 4 insertions, 1 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java b/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java
index dfc0496476..d1cc857dfa 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java
@@ -32,6 +32,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
 
 import com.android.resources.ResourceType;
 
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
@@ -78,7 +79,9 @@ public class DataResourceXml implements DataResource {
       KeyValueConsumer<DataKey, DataResource> combiningConsumer)
       throws XMLStreamException, FactoryConfigurationError, IOException {
     XMLEventReader eventReader =
-        xmlInputFactory.createXMLEventReader(Files.newBufferedReader(path, StandardCharsets.UTF_8));
+        xmlInputFactory.createXMLEventReader(
+            new BufferedInputStream(Files.newInputStream(path)),
+              StandardCharsets.UTF_8.toString());
     try {
       // TODO(corysmith): Make the xml parsing more readable.
       while (XmlResourceValues.moveToResources(eventReader)) {