am c1c55af: am e67f8c8: Merge "Normalize output from aapt d xmltree"

Jean-Baptiste Queru · Android Git Automerger · commit c386ee56b995 · 2012-08-08T12:03:43.000-07:00
* commit 'c1c55afb474dd85a6205bc8ab94065f3ac38aa77':
  Normalize output from aapt d xmltree
diff --git 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());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,8 @@ void printXMLBlock(ResXMLTree* block)`
`511`	`511`	`namespaces.pop();`
`512`	`512`	`} else if (code == ResXMLTree::TEXT) {`
`513`	`513`	`size_t len;`
`514`		`- printf("%sC: \"%s\"\n", prefix.string(), String8(block->getText(&len)).string());`
	`514`	`+ printf("%sC: \"%s\"\n", prefix.string(),`
	`515`	`+ ResTable::normalizeForOutput(String8(block->getText(&len)).string()).string());`
`515`	`516`	`}`
`516`	`517`	`}`
`517`	`518`