Support <system-sdk> in fwk manifest and dev matrix.
<system-sdk> is a tag in framework manifest and
device matrix. It states a list of System SDK levels
that the framework supports for vendor apps / vendor
apps requires.
Format:
<system-sdk>
<version>14</version>
<version>15</version>
</system-sdk>
Versions must not be duplicated.
It is compatible when the set specified in framework
manifest is a superset of the set specified in the
device compatibility matrix.
Test: libvintf_test
Test: vintf_object_tests
Bug: 69088799
Change-Id: I802f055ea60666995202438a770d1e440517ec5c
diff --git a/CompatibilityMatrix.cpp b/CompatibilityMatrix.cpp
index 8331f78..d3c4ebf 100644
--- a/CompatibilityMatrix.cpp
+++ b/CompatibilityMatrix.cpp
@@ -168,7 +168,8 @@
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
lft.device.mVndk == rgt.device.mVndk &&
#pragma clang diagnostic pop
- lft.device.mVendorNdk == rgt.device.mVendorNdk)) &&
+ lft.device.mVendorNdk == rgt.device.mVendorNdk &&
+ lft.device.mSystemSdk == rgt.device.mSystemSdk)) &&
(lft.mType != SchemaType::FRAMEWORK ||
(lft.framework.mKernels == rgt.framework.mKernels &&
lft.framework.mSepolicy == rgt.framework.mSepolicy &&