commit 09f17a6cf75e2095a9c11cca7831c54f4853b87d
author Ryan Mitchell <rtmitchell@google.com> Wed Oct 02 23:03:16 2019 +0000
committer Ryan Mitchell <rtmitchell@google.com> Wed Oct 02 23:03:16 2019 +0000
tree 207901ca923c54e9c61a68b1a6424e2272d818b2
parent 58cdc2a8226e8618331a81c1e1b77a4421bb5629

Revert "Improve idmap2 xml parsing"

This reverts commit 58cdc2a8226e8618331a81c1e1b77a4421bb5629.

Reason for revert: <aosp/1129572 caused a build failure>

Change-Id: Iecae19877dacf9ec5c2b2bc59dca362f573e9a7a

cmds/idmap2/Android.bp

diff --git a/cmds/idmap2/Android.bp b/cmds/idmap2/Android.bp
index 60d6414..4c77ba4 100644
--- a/cmds/idmap2/Android.bp
+++ b/cmds/idmap2/Android.bp
@@ -45,7 +45,7 @@
         "libidmap2/RawPrintVisitor.cpp",
         "libidmap2/ResourceUtils.cpp",
         "libidmap2/Result.cpp",
-        "libidmap2/XmlParser.cpp",
+        "libidmap2/Xml.cpp",
         "libidmap2/ZipFile.cpp",
     ],
     export_include_dirs: ["include"],
@@ -99,7 +99,7 @@
         "tests/RawPrintVisitorTests.cpp",
         "tests/ResourceUtilsTests.cpp",
         "tests/ResultTests.cpp",
-        "tests/XmlParserTests.cpp",
+        "tests/XmlTests.cpp",
         "tests/ZipFileTests.cpp",
     ],
     required: [