From: Shachar Shemesh <lingnu@gmail.com>
Date: Sun, 8 Jul 2012 03:37:48 +0000 (+0300)
Subject: Normalize output from aapt d xmltree
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/9f3378f91c0d47420b398f27d2b2640c52b9fd2a

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 8d7acee..fbb4302 100644
--- a/XMLNode.cpp
+++ b/XMLNode.cpp
@@ -511,7 +511,8 @@ void printXMLBlock(ResXMLTree* block)
             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());
         }
     }