summaryrefslogtreecommitdiff
path: root/tools/aapt/XMLNode.cpp
diff options
context:
space:
mode:
author Conley Owens <cco3@android.com> 2011-04-27 14:53:10 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-04-27 14:53:10 -0700
commit8279c193d1e7cd3b9bcc371feaf73e204cf251e5 (patch)
treef3d29e19d0e7ad076b280b338d51d356fe7758d4 /tools/aapt/XMLNode.cpp
parentac505b86b45462d9883f9c36fad0ef85e0885ee4 (diff)
parent779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe (diff)
am 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
* commit '779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe': 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());
}
}