commit d48579083ce6d35949444801a9c34e20f4eae254
author Yifan Hong <elsk@google.com> Tue Jun 13 14:13:56 2017 -0700
committer Yifan Hong <elsk@google.com> Fri Jun 23 11:41:14 2017 -0700
tree e4f818417c90b119968f9ee17ef94cb937e96f73
parent af23e28b683ec37e6f8eab1a23c43abba7de3b81

Add <xmlfile> to manifest / comp mat.

manifest.xml is allowed to contain <xmlfile> that is similar to:
<xmlfile>
    <name>media_profile</name>
    <version>1.0</version>
    <path>/path/to/media_profile_v1_0.xml</path>
</xmlfile>

For compatibility-matrix.xml
<xmlfile format="dtd" optional="false">
    <name>media_profile</name>
    <version>1.0-1</version>
    <path>/path/to/media_profile_v1_1.dtd</path>
</xmlfile>

The <path> tag is optional. See test/main.cpp for examples.

Test: libvintf_test
Test: vintf_object_test

Bug: 38359330

Change-Id: I0a921f32d023e1ba9c54ea6e898bb385fc7abd4f

CompatibilityMatrix.cpp

diff --git a/CompatibilityMatrix.cpp b/CompatibilityMatrix.cpp
index 627c238..907ac8c 100644
--- a/CompatibilityMatrix.cpp
+++ b/CompatibilityMatrix.cpp
@@ -58,14 +58,12 @@
 }
 
 bool operator==(const CompatibilityMatrix &lft, const CompatibilityMatrix &rgt) {
-    return lft.mType == rgt.mType &&
-           lft.mHals == rgt.mHals &&
-           (lft.mType != SchemaType::DEVICE || (
-                lft.device.mVndk == rgt.device.mVndk)) &&
-           (lft.mType != SchemaType::FRAMEWORK || (
-                lft.framework.mKernels == rgt.framework.mKernels &&
-                lft.framework.mSepolicy == rgt.framework.mSepolicy &&
-                lft.framework.mAvbMetaVersion == rgt.framework.mAvbMetaVersion));
+    return lft.mType == rgt.mType && lft.mHals == rgt.mHals && lft.mXmlFiles == rgt.mXmlFiles &&
+           (lft.mType != SchemaType::DEVICE || (lft.device.mVndk == rgt.device.mVndk)) &&
+           (lft.mType != SchemaType::FRAMEWORK ||
+            (lft.framework.mKernels == rgt.framework.mKernels &&
+             lft.framework.mSepolicy == rgt.framework.mSepolicy &&
+             lft.framework.mAvbMetaVersion == rgt.framework.mAvbMetaVersion));
 }
 
 } // namespace vintf