commit 0f529fab7c41b36014b90813e646b9f4a6bfc59b
author Yifan Hong <elsk@google.com> Wed Jan 10 14:51:59 2018 -0800
committer Yifan Hong <elsk@google.com> Fri Jan 12 12:37:00 2018 -0800
tree 0cfabbe49f07d555ac1114af2abc04856e6e0674
parent 47f1045ec7651e8b3bf56cd2d3bac221ca14671a

Mark Vndk / VndkVersionRange as deprecated.

<vndk> tag becomes deprecated and should not be used.
<vendor-ndk> is used to replace it instead.

Test: builds
Bug: 36400653
Change-Id: Ibeaa6c366fd78f3d4b0f06c13d8a33b71f4be1cf

CompatibilityMatrix.cpp

diff --git a/CompatibilityMatrix.cpp b/CompatibilityMatrix.cpp
index 076055c..845e443 100644
--- a/CompatibilityMatrix.cpp
+++ b/CompatibilityMatrix.cpp
@@ -162,7 +162,12 @@
 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.device.mVndk == rgt.device.mVndk)) &&
+           (lft.mType != SchemaType::DEVICE || (
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+            lft.device.mVndk == rgt.device.mVndk
+#pragma clang diagnostic pop
+           )) &&
            (lft.mType != SchemaType::FRAMEWORK ||
             (lft.framework.mKernels == rgt.framework.mKernels &&
              lft.framework.mSepolicy == rgt.framework.mSepolicy &&