Automated rollback of commit f672a31b8b19baab95373e4f2f6d110aa8b8f0fb.

*** Reason for rollback ***

Unclassified general breakages in tests. Rolling back for further investigation.

*** Original change description ***

Normalized the serialization proto to save space and allow greater versatility in storage.

RELNOTES: None
PiperOrigin-RevId: 186057879

1 files changed, 3 insertions, 2 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 b8249dcda6..a7301f1030 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
@@ -41,6 +41,7 @@ import java.util.logging.Logger;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.TransformerFactoryConfigurationError;
@@ -161,8 +162,8 @@ public class ManifestMergerAction {
   private static Options options;
 
   private static Path removePermissions(Path manifest, Path outputDir)
-      throws IOException, ParserConfigurationException, TransformerException,
-          TransformerFactoryConfigurationError, SAXException {
+      throws IOException, ParserConfigurationException, TransformerConfigurationException,
+          TransformerException, TransformerFactoryConfigurationError, SAXException {
     DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
     Document doc = docBuilder.parse(manifest.toFile());
     for (String tag : PERMISSION_TAGS) {