commit 8e9c669c47a9b59bc49d5c95922c17f1d75a6620
author Yifan Hong <elsk@google.com> Tue Feb 28 14:07:42 2017 -0800
committer Yifan Hong <elsk@google.com> Tue Feb 28 16:42:53 2017 -0800
tree 4490db06f73cb9218534662958586a839df7d40f
parent 3daec8116236a720edf3349b59470e41dd6c1056

Allow optional elements and attributes.

Per the document, allowed optional elements and attributes are:

* compatibility-matrix.hal.format
* compatibility-matrix.hal.optional
* manifest.hal.format
* manifest.hal.impl

This change is needed to support system/manifest.xml because
manifest.hal.impl is missing.

Test: `adb shell vintf` correctly shows system/manifest.xml
Test: libvintf
Change-Id: Ia54842d128ba1bc614c29f3b364642393d800086

test/main.cpp

diff --git a/test/main.cpp b/test/main.cpp
index f3c7161..5eaca81 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -161,6 +161,27 @@
         "</manifest>\n");
 }
 
+TEST_F(LibVintfTest, HalManifestOptional) {
+    HalManifest vm;
+    EXPECT_TRUE(gHalManifestConverter(&vm,
+            "<manifest version=\"1.0\"></manifest>"));
+    EXPECT_TRUE(gHalManifestConverter(&vm,
+            "<manifest version=\"1.0\">"
+            "    <hal>"
+            "        <name>android.hidl.manager</name>"
+            "        <transport>hwbinder</transport>"
+            "        <version>1.0</version>"
+            "    </hal>"
+            "</manifest>"));
+    EXPECT_FALSE(gHalManifestConverter(&vm,
+            "<manifest version=\"1.0\">"
+            "    <hal>"
+            "        <name>android.hidl.manager</name>"
+            "        <version>1.0</version>"
+            "    </hal>"
+            "</manifest>"));
+}
+
 TEST_F(LibVintfTest, HalManifestInstances) {
     HalManifest vm = testHalManifest();
     EXPECT_EQ(vm.getInstances("android.hardware.camera", "ICamera"),