Normalize output from aapt d xmltree

When using aapt dump xmltree to dump an XML which has a content element with newlines, the output contains a
newline. This makes it very difficult, sometimes impossible, to understand what is part of the content, and
what is the meta-data.

We now pass XML content through the same normalizer used for other tags.

Change-Id: I327321520fac563eb32aecaf796f2473866697fc

diff --git a/XMLNode.cpp b/XMLNode.cpp
index 8d7acee54461284fba9c829340e8ac1d3740e167..fbb43020ad52814e9b0a95f096e1ea4ff1699574 100644 (file)
--- a/XMLNode.cpp
+++ b/XMLNode.cpp
@@ -511,7 +511,8 @@ void printXMLBlock(ResXMLTree* block)
             namespaces.pop();
         } else if (code == ResXMLTree::TEXT) {
             size_t len;
             namespaces.pop();
         } else if (code == ResXMLTree::TEXT) {
             size_t len;

-            printf("%sC: \"%s\"\n", prefix.string(), String8(block->getText(&len)).string());
+            printf("%sC: \"%s\"\n", prefix.string(),
+                    ResTable::normalizeForOutput(String8(block->getText(&len)).string()).string());

         }
     }
 
         }
     }