From 429dad687bcb5f00587e8b91b3a614502907aaa1 Mon Sep 17 00:00:00 2001 From: Shachar Shemesh Date: Sun, 8 Jul 2012 06:37:48 +0300 Subject: 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 --- tools/aapt/XMLNode.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/aapt') diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp index 8d7acee..fbb4302 100644 --- a/tools/aapt/XMLNode.cpp +++ b/tools/aapt/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()); } } -- cgit v1.1