commit 0da683bd8da55a0cfa46dfe8076b729b945d6650
author Adam Lesinski <adamlesinski@google.com> Mon Oct 02 16:37:20 2017 -0700
committer Adam Lesinski <adamlesinski@google.com> Mon Oct 02 17:00:07 2017 -0700
tree cbfd404fadce2b7e664ec8ddba5aad6b8881a900
parent 96b9ddbcb26f39bc26010d44856998967e384930

AAPT2: Preserve line numbers when deserializing from binary XML

Bug: 65827146
Test: make aapt2_tests
Change-Id: Idbfea640eb8727fe209ebc6eb072296845d9f282

tools/aapt2/xml/XmlDom.cpp

diff --git a/tools/aapt2/xml/XmlDom.cpp b/tools/aapt2/xml/XmlDom.cpp
index cbb652e..1d122db 100644
--- a/tools/aapt2/xml/XmlDom.cpp
+++ b/tools/aapt2/xml/XmlDom.cpp
@@ -274,6 +274,8 @@
     switch (code) {
       case ResXMLParser::START_NAMESPACE: {
         NamespaceDecl decl;
+        decl.line_number = tree.getLineNumber();
+
         size_t len;
         const char16_t* str16 = tree.getNamespacePrefix(&len);
         if (str16) {
@@ -288,6 +290,7 @@
         if (pending_element == nullptr) {
           pending_element = util::make_unique<Element>();
         }
+        pending_element->namespace_decls.push_back(std::move(decl));
         break;
       }
 
@@ -297,8 +300,8 @@
           el = std::move(pending_element);
         } else {
           el = util::make_unique<Element>();
-          ;
         }
+        el->line_number = tree.getLineNumber();
 
         size_t len;
         const char16_t* str16 = tree.getElementNamespace(&len);