summaryrefslogtreecommitdiffstats
path: root/tools/aapt
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-04-27 13:06:46 -0700
committerAndroid Code Review <code-review@android.com>2011-04-27 13:06:46 -0700
commit4a4d96e7ee682167861434cba05531f04642bf97 (patch)
treeff08d11397463faa91448545c8d961b89fae1423 /tools/aapt
parent86d1d74762e65b6f64c2d4758aa5fd4af6275696 (diff)
parent0cd48ae3de0609089b8adf532d947a41fc418786 (diff)
downloadframeworks_base-4a4d96e7ee682167861434cba05531f04642bf97.zip
frameworks_base-4a4d96e7ee682167861434cba05531f04642bf97.tar.gz
frameworks_base-4a4d96e7ee682167861434cba05531f04642bf97.tar.bz2
Merge changes I0ab47e2f,Ib8016996
* changes: Remove errant tag terminator Normalize output of XMLtree content
Diffstat (limited to 'tools/aapt')
-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 c0d7427..19248bf 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());
}
}