commit feb454ebc29f29ca7f5241130fac243e769436e2
author Yifan Hong <elsk@google.com> Tue Jan 09 16:16:40 2018 -0800
committer Yifan Hong <elsk@google.com> Fri Jan 12 12:37:00 2018 -0800
tree 21e4f99d52c6d8ae507625cc07557362254169aa
parent 0f529fab7c41b36014b90813e646b9f4a6bfc59b

Add <vendor-ndk> tag to fwk manifest and device matrix

... in place of the old <vndk> tag. The format of this tag is:

- in framework manifest: a string (a number, or VERSION_CODE during
development):
<vendor-ndk>
    <version>27</version>
</vendor-ndk>
<vendor-ndk>
    <version>P</version>
</vendor-ndk>

- in device matrix: same format, but only one <vendor-ndk> tag.
<vendor-ndk>
    <version>27</version>
</vendor-ndk>

Test: libvintf_test
Bug: 36400653
Change-Id: If235e257026d719838076bf0e0a2b42aa8524971

CompatibilityMatrix.cpp

diff --git a/CompatibilityMatrix.cpp b/CompatibilityMatrix.cpp
index 845e443..8331f78 100644
--- a/CompatibilityMatrix.cpp
+++ b/CompatibilityMatrix.cpp
@@ -162,12 +162,13 @@
 bool operator==(const CompatibilityMatrix &lft, const CompatibilityMatrix &rgt) {
     return lft.mType == rgt.mType && lft.mLevel == rgt.mLevel && lft.mHals == rgt.mHals &&
            lft.mXmlFiles == rgt.mXmlFiles &&
-           (lft.mType != SchemaType::DEVICE || (
+           (lft.mType != SchemaType::DEVICE ||
+            (
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-            lft.device.mVndk == rgt.device.mVndk
+                lft.device.mVndk == rgt.device.mVndk &&
 #pragma clang diagnostic pop
-           )) &&
+                lft.device.mVendorNdk == rgt.device.mVendorNdk)) &&
            (lft.mType != SchemaType::FRAMEWORK ||
             (lft.framework.mKernels == rgt.framework.mKernels &&
              lft.framework.mSepolicy == rgt.framework.mSepolicy &&