Revert "Improve idmap2 xml parsing"
This reverts commit 58cdc2a8226e8618331a81c1e1b77a4421bb5629.
Reason for revert: <aosp/1129572 caused a build failure>
Change-Id: Iecae19877dacf9ec5c2b2bc59dca362f573e9a7a
diff --git a/cmds/idmap2/libidmap2/ResourceUtils.cpp b/cmds/idmap2/libidmap2/ResourceUtils.cpp
index 018d3b4..71ba3f0 100644
--- a/cmds/idmap2/libidmap2/ResourceUtils.cpp
+++ b/cmds/idmap2/libidmap2/ResourceUtils.cpp
@@ -22,18 +22,18 @@
#include "androidfw/StringPiece.h"
#include "androidfw/Util.h"
#include "idmap2/Result.h"
-#include "idmap2/XmlParser.h"
+#include "idmap2/Xml.h"
#include "idmap2/ZipFile.h"
using android::StringPiece16;
using android::idmap2::Result;
-using android::idmap2::XmlParser;
+using android::idmap2::Xml;
using android::idmap2::ZipFile;
using android::util::Utf16ToUtf8;
namespace android::idmap2::utils {
-Result<std::string> ResToTypeEntryName(const AssetManager2& am, uint32_t resid) {
+Result<std::string> ResToTypeEntryName(const AssetManager2& am, ResourceId resid) {
AssetManager2::ResourceName name;
if (!am.GetResourceName(resid, &name)) {
return Error("no resource 0x%08x in asset manager", resid);
@@ -65,55 +65,42 @@
return Error("failed to uncompress AndroidManifest.xml from %s", path.c_str());
}
- Result<std::unique_ptr<const XmlParser>> xml = XmlParser::Create(entry->buf, entry->size);
+ std::unique_ptr<const Xml> xml = Xml::Create(entry->buf, entry->size);
if (!xml) {
return Error("failed to parse AndroidManifest.xml from %s", path.c_str());
}
- auto manifest_it = (*xml)->tree_iterator();
- if (manifest_it->event() != XmlParser::Event::START_TAG || manifest_it->name() != "manifest") {
- return Error("root element tag is not <manifest> in AndroidManifest.xml of %s", path.c_str());
- }
-
- auto overlay_it = std::find_if(manifest_it.begin(), manifest_it.end(), [](const auto& it) {
- return it.event() == XmlParser::Event::START_TAG && it.name() == "overlay";
- });
-
OverlayManifestInfo info{};
- if (overlay_it == manifest_it.end()) {
- if (!assert_overlay) {
- return info;
+ const auto tag = xml->FindTag("overlay");
+ if (!tag) {
+ if (assert_overlay) {
+ return Error("<overlay> missing from AndroidManifest.xml of %s", path.c_str());
}
- return Error("<overlay> missing from AndroidManifest.xml of %s", path.c_str());
+ return info;
}
- if (auto result_str = overlay_it->GetAttributeStringValue("targetPackage")) {
- info.target_package = *result_str;
+ auto iter = tag->find("targetPackage");
+ if (iter == tag->end()) {
+ if (assert_overlay) {
+ return Error("android:targetPackage missing from <overlay> of %s", path.c_str());
+ }
} else {
- return Error("android:targetPackage missing from <overlay> of %s: %s", path.c_str(),
- result_str.GetErrorMessage().c_str());
+ info.target_package = iter->second;
}
- if (auto result_str = overlay_it->GetAttributeStringValue("targetName")) {
- info.target_name = *result_str;
+ iter = tag->find("targetName");
+ if (iter != tag->end()) {
+ info.target_name = iter->second;
}
- if (auto result_value = overlay_it->GetAttributeValue("isStatic")) {
- if ((*result_value).dataType >= Res_value::TYPE_FIRST_INT &&
- (*result_value).dataType <= Res_value::TYPE_LAST_INT) {
- info.is_static = (*result_value).data != 0U;
- } else {
- return Error("android:isStatic is not a boolean in AndroidManifest.xml of %s", path.c_str());
- }
+ iter = tag->find("isStatic");
+ if (iter != tag->end()) {
+ info.is_static = std::stoul(iter->second) != 0U;
}
- if (auto result_value = overlay_it->GetAttributeValue("priority")) {
- if ((*result_value).dataType >= Res_value::TYPE_FIRST_INT &&
- (*result_value).dataType <= Res_value::TYPE_LAST_INT) {
- info.priority = (*result_value).data;
- } else {
- return Error("android:priority is not an integer in AndroidManifest.xml of %s", path.c_str());
- }
+ iter = tag->find("priority");
+ if (iter != tag->end()) {
+ info.priority = std::stoi(iter->second);
}
return info;
diff --git a/cmds/idmap2/libidmap2/Xml.cpp b/cmds/idmap2/libidmap2/Xml.cpp
new file mode 100644
index 0000000..2645868
--- /dev/null
+++ b/cmds/idmap2/libidmap2/Xml.cpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "idmap2/Xml.h"
+
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+
+namespace android::idmap2 {
+
+std::unique_ptr<const Xml> Xml::Create(const uint8_t* data, size_t size, bool copyData) {
+ std::unique_ptr<Xml> xml(new Xml());
+ if (xml->xml_.setTo(data, size, copyData) != NO_ERROR) {
+ return nullptr;
+ }
+ return xml;
+}
+
+std::unique_ptr<std::map<std::string, std::string>> Xml::FindTag(const std::string& name) const {
+ const String16 tag_to_find(name.c_str(), name.size());
+ xml_.restart();
+ ResXMLParser::event_code_t type;
+ do {
+ type = xml_.next();
+ if (type == ResXMLParser::START_TAG) {
+ size_t len;
+ const String16 tag(xml_.getElementName(&len));
+ if (tag == tag_to_find) {
+ std::unique_ptr<std::map<std::string, std::string>> map(
+ new std::map<std::string, std::string>());
+ for (size_t i = 0; i < xml_.getAttributeCount(); i++) {
+ const String16 key16(xml_.getAttributeName(i, &len));
+ std::string key = String8(key16).c_str();
+
+ std::string value;
+ switch (xml_.getAttributeDataType(i)) {
+ case Res_value::TYPE_STRING: {
+ const String16 value16(xml_.getAttributeStringValue(i, &len));
+ value = String8(value16).c_str();
+ } break;
+ case Res_value::TYPE_INT_DEC:
+ case Res_value::TYPE_INT_HEX:
+ case Res_value::TYPE_INT_BOOLEAN: {
+ Res_value resValue;
+ xml_.getAttributeValue(i, &resValue);
+ value = std::to_string(resValue.data);
+ } break;
+ default:
+ return nullptr;
+ }
+
+ map->emplace(std::make_pair(key, value));
+ }
+ return map;
+ }
+ }
+ } while (type != ResXMLParser::BAD_DOCUMENT && type != ResXMLParser::END_DOCUMENT);
+ return nullptr;
+}
+
+Xml::~Xml() {
+ xml_.uninit();
+}
+
+} // namespace android::idmap2
diff --git a/cmds/idmap2/libidmap2/XmlParser.cpp b/cmds/idmap2/libidmap2/XmlParser.cpp
deleted file mode 100644
index 526a560..0000000
--- a/cmds/idmap2/libidmap2/XmlParser.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "idmap2/XmlParser.h"
-
-#include <iostream>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-
-namespace android::idmap2 {
-
-template <typename T>
-ResXMLParser::ResXMLPosition get_tree_position(const T& tree) {
- ResXMLParser::ResXMLPosition pos{};
- tree.getPosition(&pos);
- return pos;
-}
-
-XmlParser::Node::Node(const ResXMLTree& tree) : Node(tree, get_tree_position(tree)) {
-}
-XmlParser::Node::Node(const ResXMLTree& tree, const ResXMLParser::ResXMLPosition& pos)
- : parser_(tree) {
- set_position(pos);
-}
-
-bool XmlParser::Node::operator==(const XmlParser::Node& rhs) const {
- ResXMLParser::ResXMLPosition pos = get_position();
- ResXMLParser::ResXMLPosition rhs_pos = rhs.get_position();
- return pos.curExt == rhs_pos.curExt && pos.curNode == rhs_pos.curNode &&
- pos.eventCode == rhs_pos.eventCode;
-}
-
-bool XmlParser::Node::operator!=(const XmlParser::Node& rhs) const {
- return !(*this == rhs);
-}
-
-ResXMLParser::ResXMLPosition XmlParser::Node::get_position() const {
- return get_tree_position(parser_);
-}
-
-void XmlParser::Node::set_position(const ResXMLParser::ResXMLPosition& pos) {
- parser_.setPosition(pos);
-}
-
-bool XmlParser::Node::Seek(bool inner_child) {
- if (parser_.getEventType() == XmlParser::Event::END_TAG) {
- return false;
- }
-
- ssize_t depth = 0;
- XmlParser::Event code;
- while ((code = parser_.next()) != XmlParser::Event::BAD_DOCUMENT &&
- code != XmlParser::Event::END_DOCUMENT) {
- if (code == XmlParser::Event::START_TAG) {
- if (++depth == (inner_child ? 1 : 0)) {
- return true;
- }
- } else if (code == XmlParser::Event::END_TAG) {
- if (--depth == (inner_child ? -1 : -2)) {
- return false;
- }
- }
- }
-
- return false;
-}
-
-XmlParser::Event XmlParser::Node::event() const {
- return parser_.getEventType();
-}
-
-std::string XmlParser::Node::name() const {
- size_t len;
- const String16 key16(parser_.getElementName(&len));
- return String8(key16).c_str();
-}
-
-Result<std::string> XmlParser::Node::GetAttributeStringValue(const std::string& name) const {
- auto value = GetAttributeValue(name);
- if (!value) {
- return value.GetError();
- }
-
- switch ((*value).dataType) {
- case Res_value::TYPE_STRING: {
- size_t len;
- const String16 value16(parser_.getStrings().stringAt((*value).data, &len));
- return std::string(String8(value16).c_str());
- }
- case Res_value::TYPE_INT_DEC:
- case Res_value::TYPE_INT_HEX:
- case Res_value::TYPE_INT_BOOLEAN: {
- return std::to_string((*value).data);
- }
- default:
- return Error(R"(Failed to convert attribute "%s" value to a string)", name.c_str());
- }
-}
-
-Result<Res_value> XmlParser::Node::GetAttributeValue(const std::string& name) const {
- size_t len;
- for (size_t i = 0; i < parser_.getAttributeCount(); i++) {
- const String16 key16(parser_.getAttributeName(i, &len));
- std::string key = String8(key16).c_str();
- if (key != name) {
- continue;
- }
-
- Res_value res_value{};
- if (parser_.getAttributeValue(i, &res_value) == BAD_TYPE) {
- return Error(R"(Bad value for attribute "%s")", name.c_str());
- }
-
- return res_value;
- }
-
- return Error(R"(Failed to find attribute "%s")", name.c_str());
-}
-
-Result<std::unique_ptr<const XmlParser>> XmlParser::Create(const void* data, size_t size,
- bool copy_data) {
- auto parser = std::unique_ptr<const XmlParser>(new XmlParser());
- if (parser->tree_.setTo(data, size, copy_data) != NO_ERROR) {
- return Error("Malformed xml block");
- }
-
- // Find the beginning of the first tag.
- XmlParser::Event event;
- while ((event = parser->tree_.next()) != XmlParser::Event::BAD_DOCUMENT &&
- event != XmlParser::Event::END_DOCUMENT && event != XmlParser::Event::START_TAG) {
- }
-
- if (event == XmlParser::Event::END_DOCUMENT) {
- return Error("Root tag was not be found");
- }
-
- if (event == XmlParser::Event::BAD_DOCUMENT) {
- return Error("Bad xml document");
- }
-
- return parser;
-}
-
-XmlParser::~XmlParser() {
- tree_.uninit();
-}
-
-} // namespace android::idmap2