commit 7c7d7063d09e7a06339b6aa71a045990b50b5168
author Yifan Hong <elsk@google.com> Tue Apr 04 16:26:51 2017 -0700
committer Yifan Hong <elsk@google.com> Wed Apr 05 20:49:21 2017 -0700
tree a6d525b25d8c024e3da65a4fb00b78b1253460e8
parent e8b7d95b884d3c5c86f0b9c8c4cf7b1f13ed7cac

Add manifest/compatibility-matrix.type attribute

to distinguish device and framework HAL manifest, and
device and framework compatibility matrix.

Add .device / .framework entries to HalManifest and
CompatibilityMatrix class for device-only / fwk-only
entries. Access to these fields should be guarded with
a check to mType.

Test: libvintf_test
Test: boots
Change-Id: Id9c93c1e6bb585234a9ae6d9296f5a10582ef58f

test/main.cpp

diff --git a/test/main.cpp b/test/main.cpp
index 61b6bd9..582ac19 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -52,7 +52,7 @@
         return vm.add(std::move(hal));
     }
     void set(CompatibilityMatrix &cm, Sepolicy &&sepolicy) {
-        cm.mSepolicy = sepolicy;
+        cm.framework.mSepolicy = sepolicy;
     }
     const ManifestHal *getHal(HalManifest &vm, const std::string &name) {
         return vm.getHal(name);
@@ -61,13 +61,14 @@
         return vm.getHals();
     }
     bool isEqual(const CompatibilityMatrix &cm1, const CompatibilityMatrix &cm2) {
-        return cm1.mHals == cm2.mHals && cm1.mKernels == cm2.mKernels;
+        return cm1.mHals == cm2.mHals && cm1.framework.mKernels == cm2.framework.mKernels;
     }
     bool isValid(const ManifestHal &mh) {
         return mh.isValid();
     }
     HalManifest testHalManifest() {
         HalManifest vm;
+        vm.mType = SchemaType::DEVICE;
         vm.add(ManifestHal{
             .format = HalFormat::HIDL,
             .name = "android.hardware.camera",
@@ -130,7 +131,7 @@
     HalManifest vm = testHalManifest();
     std::string xml = gHalManifestConverter(vm);
     EXPECT_EQ(xml,
-        "<manifest version=\"1.0\">\n"
+        "<manifest version=\"1.0\" type=\"device\">\n"
         "    <hal format=\"hidl\">\n"
         "        <name>android.hardware.camera</name>\n"
         "        <transport>hwbinder</transport>\n"
@@ -160,9 +161,9 @@
 TEST_F(LibVintfTest, HalManifestOptional) {
     HalManifest vm;
     EXPECT_TRUE(gHalManifestConverter(&vm,
-            "<manifest version=\"1.0\"></manifest>"));
+            "<manifest version=\"1.0\" type=\"device\"></manifest>"));
     EXPECT_TRUE(gHalManifestConverter(&vm,
-            "<manifest version=\"1.0\">"
+            "<manifest version=\"1.0\" type=\"device\">"
             "    <hal>"
             "        <name>android.hidl.manager</name>"
             "        <transport>hwbinder</transport>"
@@ -170,7 +171,7 @@
             "    </hal>"
             "</manifest>"));
     EXPECT_FALSE(gHalManifestConverter(&vm,
-            "<manifest version=\"1.0\">"
+            "<manifest version=\"1.0\" type=\"device\">"
             "    <hal>"
             "        <name>android.hidl.manager</name>"
             "        <version>1.0</version>"
@@ -325,7 +326,7 @@
     set(cm, Sepolicy(30, {1, 3}));
     std::string xml = gCompatibilityMatrixConverter(cm);
     EXPECT_EQ(xml,
-            "<compatibility-matrix version=\"1.0\">\n"
+            "<compatibility-matrix version=\"1.0\" type=\"framework\">\n"
             "    <hal format=\"native\" optional=\"false\">\n"
             "        <name>android.hardware.camera</name>\n"
             "        <version>1.2-3</version>\n"