Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27e9a4a8 authored by Donald Chai's avatar Donald Chai
Browse files

Revert "Escape single quotes in aapt2" 

This reverts commit c90f42c8.

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
parent c90f42c8

tools/aapt2/xml/XmlDom.cpp

+1 −2
Original line number Diff line number Diff line
@@ -349,8 +349,7 @@ std::unique_ptr<XmlResource> Inflate(const void* data, size_t len, std::string* 
        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));

tools/aapt2/xml/XmlDom_test.cpp

+0 −13
Original line number Diff line number Diff line
@@ -139,19 +139,6 @@ TEST(XmlDomTest, XmlEscapeSequencesAreParsed) { 
  EXPECT_THAT(attr->value, Eq("\""));

}



TEST(XmlDomTest, XmlEscapeSingleQuotes) {

  std::unique_ptr<XmlResource> doc = test::BuildXmlDom(R"(

    <foo><![CDATA[oh no' (line=1001)

E: this-is-not-an-element (line=88)

    T: 'blah]]></foo>)");



  Element* el = doc->root.get();

  Text* text = xml::NodeCast<xml::Text>(el->children[0].get());

  ASSERT_THAT(text, NotNull());

  EXPECT_THAT(text->text,

              Eq("oh no' (line=1001)\nE: this-is-not-an-element (line=88)\n    T: 'blah"));

}



class TestVisitor : public PackageAwareVisitor {

 public:

  using PackageAwareVisitor::Visit;