Add HalInterface to compatibility matrix

Test: libvintf_test
Test: vintf_object_test

Bug: 38395193
Change-Id: I6dfc21bbfb63b575558405e441f3926ff3813eb8
Merged-In: I6dfc21bbfb63b575558405e441f3926ff3813eb8

7 files changed, 99 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index 47b9863..22224e9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,6 +39,7 @@ cc_library {
         "parse_xml.cpp",
         "CompatibilityMatrix.cpp",
         "HalManifest.cpp",
+        "HalInterface.cpp",
         "KernelConfigTypedValue.cpp",
         "RuntimeInfo.cpp",
         "ManifestHal.cpp",
@@ -108,6 +109,7 @@ cc_library {
         "parse_xml.cpp",
         "CompatibilityMatrix.cpp",
         "HalManifest.cpp",
+        "HalInterface.cpp",
         "KernelConfigTypedValue.cpp",
         "RuntimeInfo.cpp",
         "ManifestHal.cpp",
diff --git a/HalInterface.cpp b/HalInterface.cpp
new file mode 100644
index 0000000..2dbf57c
--- /dev/null
+++ b/HalInterface.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2017 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 <set>
+#include <string>
+
+#include "HalInterface.h"
+
+namespace android {
+namespace vintf {
+
+bool operator==(const HalInterface& lft, const HalInterface& rgt) {
+    if (lft.name != rgt.name)
+        return false;
+    if (lft.instances != rgt.instances)
+        return false;
+    return true;
+}
+
+} // namespace vintf
+} // namespace android
+
diff --git a/MatrixHal.cpp b/MatrixHal.cpp
index aa6f7f3..1db7f40 100644
--- a/MatrixHal.cpp
+++ b/MatrixHal.cpp
@@ -26,6 +26,8 @@ bool MatrixHal::operator==(const MatrixHal &other) const {
         return false;
     if (versionRanges != other.versionRanges)
         return false;
+    if (interfaces != other.interfaces)
+        return false;
     // do not compare optional
     return true;
 }
diff --git a/include/vintf/HalInterface.h b/include/vintf/HalInterface.h
index 7926b49..a5645d3 100644
--- a/include/vintf/HalInterface.h
+++ b/include/vintf/HalInterface.h
@@ -29,6 +29,8 @@ struct HalInterface {
     std::set<std::string> instances;
 };
 
+bool operator==(const HalInterface&, const HalInterface&);
+
 } // namespace vintf
 } // namespace android
 
diff --git a/include/vintf/MatrixHal.h b/include/vintf/MatrixHal.h
index ed34d24..e8c4a2a 100644
--- a/include/vintf/MatrixHal.h
+++ b/include/vintf/MatrixHal.h
@@ -17,10 +17,12 @@
 #ifndef ANDROID_VINTF_MATRIX_HAL_H
 #define ANDROID_VINTF_MATRIX_HAL_H
 
+#include <map>
 #include <string>
 #include <vector>
 
 #include "HalFormat.h"
+#include "HalInterface.h"
 #include "VersionRange.h"
 
 namespace android {
@@ -35,6 +37,7 @@ struct MatrixHal {
     std::string name;
     std::vector<VersionRange> versionRanges;
     bool optional = false;
+    std::map<std::string, HalInterface> interfaces;
 };
 
 } // namespace vintf
diff --git a/parse_xml.cpp b/parse_xml.cpp
index 7287604..8caab4f 100644
--- a/parse_xml.cpp
+++ b/parse_xml.cpp
@@ -470,14 +470,25 @@ struct MatrixHalConverter : public XmlNodeConverter<MatrixHal> {
         appendAttr(root, "optional", hal.optional);
         appendTextElement(root, "name", hal.name, d);
         appendChildren(root, versionRangeConverter, hal.versionRanges, d);
+        appendChildren(root, halInterfaceConverter, iterateValues(hal.interfaces), d);
     }
     bool buildObject(MatrixHal *object, NodeType *root) const override {
+        std::vector<HalInterface> interfaces;
         if (!parseOptionalAttr(root, "format", HalFormat::HIDL, &object->format) ||
             !parseOptionalAttr(root, "optional", false /* defaultValue */, &object->optional) ||
             !parseTextElement(root, "name", &object->name) ||
-            !parseChildren(root, versionRangeConverter, &object->versionRanges)) {
+            !parseChildren(root, versionRangeConverter, &object->versionRanges) ||
+            !parseChildren(root, halInterfaceConverter, &interfaces)) {
             return false;
         }
+        for (auto&& interface : interfaces) {
+            std::string name{interface.name};
+            auto res = object->interfaces.emplace(std::move(name), std::move(interface));
+            if (!res.second) {
+                this->mLastError = "Duplicated instance entry " + res.first->first;
+                return false;
+            }
+        }
         return true;
     }
 };
diff --git a/test/main.cpp b/test/main.cpp
index fce4d6d..9bdaead 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -84,6 +84,16 @@ public:
     bool isValid(const ManifestHal &mh) {
         return mh.isValid();
     }
+
+    std::map<std::string, HalInterface> testHalInterfaces() {
+        HalInterface intf;
+        intf.name = "IFoo";
+        intf.instances.insert("default");
+        std::map<std::string, HalInterface> map;
+        map[intf.name] = intf;
+        return map;
+    }
+
     HalManifest testDeviceManifest() {
         HalManifest vm;
         vm.mType = SchemaType::DEVICE;
@@ -296,16 +306,32 @@ TEST_F(LibVintfTest, VersionConverter) {
     EXPECT_EQ(v, v2);
 }
 
+static bool insert(std::map<std::string, HalInterface>* map, HalInterface&& intf) {
+    std::string name{intf.name};
+    return map->emplace(std::move(name), std::move(intf)).second;
+}
+
 TEST_F(LibVintfTest, MatrixHalConverter) {
     MatrixHal mh{HalFormat::NATIVE, "android.hardware.camera",
             {{VersionRange(1,2,3), VersionRange(4,5,6)}},
-            false /* optional */};
+            false /* optional */, {}};
+    EXPECT_TRUE(insert(&mh.interfaces, {"IBetterCamera", {"default", "great"}}));
+    EXPECT_TRUE(insert(&mh.interfaces, {"ICamera", {"default"}}));
     std::string xml = gMatrixHalConverter(mh);
     EXPECT_EQ(xml,
         "<hal format=\"native\" optional=\"false\">\n"
         "    <name>android.hardware.camera</name>\n"
         "    <version>1.2-3</version>\n"
         "    <version>4.5-6</version>\n"
+        "    <interface>\n"
+        "        <name>IBetterCamera</name>\n"
+        "        <instance>default</instance>\n"
+        "        <instance>great</instance>\n"
+        "    </interface>\n"
+        "    <interface>\n"
+        "        <name>ICamera</name>\n"
+        "        <instance>default</instance>\n"
+        "    </interface>\n"
         "</hal>\n");
     MatrixHal mh2;
     EXPECT_TRUE(gMatrixHalConverter(&mh2, xml));
@@ -396,14 +422,14 @@ TEST_F(LibVintfTest, KernelConfigTypedValueConverter) {
             "<value type=\"int\">18446744073709551616</value>\n"));
 }
 
-TEST_F(LibVintfTest, CompatibilityMatrixCoverter) {
+TEST_F(LibVintfTest, CompatibilityMatrixConverter) {
     CompatibilityMatrix cm;
     EXPECT_TRUE(add(cm, MatrixHal{HalFormat::NATIVE, "android.hardware.camera",
             {{VersionRange(1,2,3), VersionRange(4,5,6)}},
-            false /* optional */}));
+            false /* optional */, testHalInterfaces()}));
     EXPECT_TRUE(add(cm, MatrixHal{HalFormat::NATIVE, "android.hardware.nfc",
             {{VersionRange(4,5,6), VersionRange(10,11,12)}},
-            true /* optional */}));
+            true /* optional */, testHalInterfaces()}));
     EXPECT_TRUE(add(cm, MatrixKernel{KernelVersion(3, 18, 22),
             {KernelConfig{"CONFIG_FOO", Tristate::YES}, KernelConfig{"CONFIG_BAR", "stringvalue"}}}));
     EXPECT_TRUE(add(cm, MatrixKernel{KernelVersion(4, 4, 1),
@@ -417,11 +443,19 @@ TEST_F(LibVintfTest, CompatibilityMatrixCoverter) {
             "        <name>android.hardware.camera</name>\n"
             "        <version>1.2-3</version>\n"
             "        <version>4.5-6</version>\n"
+            "        <interface>\n"
+            "            <name>IFoo</name>\n"
+            "            <instance>default</instance>\n"
+            "        </interface>\n"
             "    </hal>\n"
             "    <hal format=\"native\" optional=\"true\">\n"
             "        <name>android.hardware.nfc</name>\n"
             "        <version>4.5-6</version>\n"
             "        <version>10.11-12</version>\n"
+            "        <interface>\n"
+            "            <name>IFoo</name>\n"
+            "            <instance>default</instance>\n"
+            "        </interface>\n"
             "    </hal>\n"
             "    <kernel version=\"3.18.22\">\n"
             "        <config>\n"
@@ -461,7 +495,7 @@ TEST_F(LibVintfTest, DeviceCompatibilityMatrixCoverter) {
     CompatibilityMatrix cm;
     EXPECT_TRUE(add(cm, MatrixHal{HalFormat::NATIVE, "android.hidl.manager",
             {{VersionRange(1,0)}},
-            false /* optional */}));
+            false /* optional */, testHalInterfaces()}));
     set(cm, SchemaType::DEVICE);
     set(cm, VndkVersionRange{25,0,1,5}, {"libjpeg.so", "libbase.so"});
     std::string xml = gCompatibilityMatrixConverter(cm);
@@ -470,6 +504,10 @@ TEST_F(LibVintfTest, DeviceCompatibilityMatrixCoverter) {
         "    <hal format=\"native\" optional=\"false\">\n"
         "        <name>android.hidl.manager</name>\n"
         "        <version>1.0</version>\n"
+        "        <interface>\n"
+        "            <name>IFoo</name>\n"
+        "            <instance>default</instance>\n"
+        "        </interface>\n"
         "    </hal>\n"
         "    <vndk>\n"
         "        <version>25.0.1-5</version>\n"