commit 27e9a4a85fe74bf13614396bb681967b53924f90
author Donald Chai <dchai@google.com> Sun May 01 22:25:03 2022 +0000
committer Donald Chai <dchai@google.com> Sun May 01 22:28:21 2022 +0000
tree a8cf108262ab7b7c1858153c6bcffb8352bdeb58
parent c90f42c80fc9472ad1b46402672c0444b0365f49

Revert "Escape single quotes in aapt2"

This reverts commit c90f42c80fc9472ad1b46402672c0444b0365f49.

Reason for revert: Introduces the escaping *into the APKs*; as mentioned in b/140373430#comment3 the Right Way to dump XML is via textproto.
Fix: 222745626
Bug: 140373430

Change-Id: I775b8a304e76a83934c36886c17cf23560914d21

tools/aapt2/xml/XmlDom.cpp

diff --git a/tools/aapt2/xml/XmlDom.cpp b/tools/aapt2/xml/XmlDom.cpp
index dd60f17..8b7eadf9 100644
--- a/tools/aapt2/xml/XmlDom.cpp
+++ b/tools/aapt2/xml/XmlDom.cpp
@@ -349,8 +349,7 @@
         size_t len;
         const char16_t* str16 = tree.getText(&len);
         if (str16) {
-          text->text =
-              ResTable::normalizeForOutput(util::Utf16ToUtf8(StringPiece16(str16, len)).c_str());
+          text->text = util::Utf16ToUtf8(StringPiece16(str16, len));
         }
         CHECK(!node_stack.empty());
         node_stack.top()->AppendChild(std::move(text));