summaryrefslogtreecommitdiff
path: root/tools/aapt/XMLNode.cpp
diff options
context:
space:
mode:
author Conley Owens <cco3@android.com> 2011-04-27 13:48:45 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-04-27 13:48:45 -0700
commit779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe (patch)
treeea179e8e6bf4ecce4bae884571189df3aaf661ba /tools/aapt/XMLNode.cpp
parentf0556bb90ff38be96c6099f5efafe386cd7f1083 (diff)
parent4a4d96e7ee682167861434cba05531f04642bf97 (diff)
am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
* commit '4a4d96e7ee682167861434cba05531f04642bf97': Remove errant tag terminator Normalize output of XMLtree content
Diffstat (limited to 'tools/aapt/XMLNode.cpp')
-rw-r--r--tools/aapt/XMLNode.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp
index c0d74275a8a6..19248bf7fe37 100644
--- a/tools/aapt/XMLNode.cpp
+++ b/tools/aapt/XMLNode.cpp
@@ -504,7 +504,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());
}
}