commit 476b63fcdca477971fb33da225efcb4cdc6104b1
author Yifan Hong <elsk@google.com> Wed May 17 18:15:01 2017 -0700
committer Yifan Hong <elsk@google.com> Fri May 19 13:59:14 2017 -0700
tree 1eef114ad49e7b15f6f321a1581b894d0a27c2c6
parent cc519864dbd810eb7267e07c744ea4220e8db48e

Renamed ManifestHalInterface to HalInterface

because it is used by compatibility matrix as well.

Bug: 38395193
Test: compiles

Change-Id: I186fdf4e7fd7076f2ac9d7e95eda5ba7510f9dad
Merged-In: I186fdf4e7fd7076f2ac9d7e95eda5ba7510f9dad

parse_xml.cpp

diff --git a/parse_xml.cpp b/parse_xml.cpp
index 9f144f4..7287604 100644
--- a/parse_xml.cpp
+++ b/parse_xml.cpp
@@ -439,6 +439,30 @@
 
 const KernelConfigConverter kernelConfigConverter{};
 
+struct HalInterfaceConverter : public XmlNodeConverter<HalInterface> {
+    std::string elementName() const override { return "interface"; }
+    void mutateNode(const HalInterface &intf, NodeType *root, DocType *d) const override {
+        appendTextElement(root, "name", intf.name, d);
+        appendTextElements(root, "instance", intf.instances, d);
+    }
+    bool buildObject(HalInterface *intf, NodeType *root) const override {
+        std::vector<std::string> instances;
+        if (!parseTextElement(root, "name", &intf->name) ||
+            !parseTextElements(root, "instance", &instances)) {
+            return false;
+        }
+        intf->instances.clear();
+        intf->instances.insert(instances.begin(), instances.end());
+        if (intf->instances.size() != instances.size()) {
+            this->mLastError = "Duplicated instances in " + intf->name;
+            return false;
+        }
+        return true;
+    }
+};
+
+const HalInterfaceConverter halInterfaceConverter{};
+
 struct MatrixHalConverter : public XmlNodeConverter<MatrixHal> {
     std::string elementName() const override { return "hal"; }
     void mutateNode(const MatrixHal &hal, NodeType *root, DocType *d) const override {
@@ -477,30 +501,6 @@
 
 const MatrixKernelConverter matrixKernelConverter{};
 
-struct ManfiestHalInterfaceConverter : public XmlNodeConverter<ManifestHalInterface> {
-    std::string elementName() const override { return "interface"; }
-    void mutateNode(const ManifestHalInterface &intf, NodeType *root, DocType *d) const override {
-        appendTextElement(root, "name", intf.name, d);
-        appendTextElements(root, "instance", intf.instances, d);
-    }
-    bool buildObject(ManifestHalInterface *intf, NodeType *root) const override {
-        std::vector<std::string> instances;
-        if (!parseTextElement(root, "name", &intf->name) ||
-            !parseTextElements(root, "instance", &instances)) {
-            return false;
-        }
-        intf->instances.clear();
-        intf->instances.insert(instances.begin(), instances.end());
-        if (intf->instances.size() != instances.size()) {
-            this->mLastError = "Duplicated instances in " + intf->name;
-            return false;
-        }
-        return true;
-    }
-};
-
-const ManfiestHalInterfaceConverter manfiestHalInterfaceConverter{};
-
 struct ManifestHalConverter : public XmlNodeConverter<ManifestHal> {
     std::string elementName() const override { return "hal"; }
     void mutateNode(const ManifestHal &hal, NodeType *root, DocType *d) const override {
@@ -510,15 +510,15 @@
             appendChild(root, transportArchConverter(hal.transportArch, d));
         }
         appendChildren(root, versionConverter, hal.versions, d);
-        appendChildren(root, manfiestHalInterfaceConverter, iterateValues(hal.interfaces), d);
+        appendChildren(root, halInterfaceConverter, iterateValues(hal.interfaces), d);
     }
     bool buildObject(ManifestHal *object, NodeType *root) const override {
-        std::vector<ManifestHalInterface> interfaces;
+        std::vector<HalInterface> interfaces;
         if (!parseOptionalAttr(root, "format", HalFormat::HIDL, &object->format) ||
             !parseTextElement(root, "name", &object->name) ||
             !parseChild(root, transportArchConverter, &object->transportArch) ||
             !parseChildren(root, versionConverter, &object->versions) ||
-            !parseChildren(root, manfiestHalInterfaceConverter, &interfaces)) {
+            !parseChildren(root, halInterfaceConverter, &interfaces)) {
             return false;
         }
         object->interfaces.clear();