From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 8 Aug 2012 18:21:28 +0000 (-0700)
Subject: Merge "Normalize output from aapt d xmltree"
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/4f2cc28592dc79e929d6422887b9f71702ec510a?hp=-c

Merge "Normalize output from aapt d xmltree"
---

4f2cc28592dc79e929d6422887b9f71702ec510a
diff --combined XMLNode.cpp
index 0dba950,fbb4302..dcbe7db
--- a/XMLNode.cpp
+++ b/XMLNode.cpp
@@@ -511,7 -511,8 +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());
          }
      }
  
@@@ -973,7 -974,7 +974,7 @@@ status_t XMLNode::assignResourceIds(con
  status_t XMLNode::flatten(const sp<AaptFile>& dest,
          bool stripComments, bool stripRawValues) const
  {
 -    StringPool strings = StringPool(false, mUTF8);
 +    StringPool strings(mUTF8);
      Vector<uint32_t> resids;
      
      // First collect just the strings for attribute names that have a