diff options
author | Yifan Hong | 2018-01-10 16:51:59 -0600 |
---|---|---|
committer | Yifan Hong | 2018-01-12 14:37:00 -0600 |
commit | 0f529fab7c41b36014b90813e646b9f4a6bfc59b (patch) | |
tree | 0cfabbe49f07d555ac1114af2abc04856e6e0674 /CompatibilityMatrix.cpp | |
parent | 47f1045ec7651e8b3bf56cd2d3bac221ca14671a (diff) | |
download | platform-system-libvintf-0f529fab7c41b36014b90813e646b9f4a6bfc59b.tar.gz platform-system-libvintf-0f529fab7c41b36014b90813e646b9f4a6bfc59b.tar.xz platform-system-libvintf-0f529fab7c41b36014b90813e646b9f4a6bfc59b.zip |
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
Diffstat (limited to 'CompatibilityMatrix.cpp')
-rw-r--r-- | CompatibilityMatrix.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/CompatibilityMatrix.cpp b/CompatibilityMatrix.cpp index 076055c..845e443 100644 --- a/CompatibilityMatrix.cpp +++ b/CompatibilityMatrix.cpp | |||
@@ -162,7 +162,12 @@ bool CompatibilityMatrix::addAllXmlFilesAsOptional(CompatibilityMatrix* other, s | |||
162 | bool operator==(const CompatibilityMatrix &lft, const CompatibilityMatrix &rgt) { | 162 | bool operator==(const CompatibilityMatrix &lft, const CompatibilityMatrix &rgt) { |
163 | return lft.mType == rgt.mType && lft.mLevel == rgt.mLevel && lft.mHals == rgt.mHals && | 163 | return lft.mType == rgt.mType && lft.mLevel == rgt.mLevel && lft.mHals == rgt.mHals && |
164 | lft.mXmlFiles == rgt.mXmlFiles && | 164 | lft.mXmlFiles == rgt.mXmlFiles && |
165 | (lft.mType != SchemaType::DEVICE || (lft.device.mVndk == rgt.device.mVndk)) && | 165 | (lft.mType != SchemaType::DEVICE || ( |
166 | #pragma clang diagnostic push | ||
167 | #pragma clang diagnostic ignored "-Wdeprecated-declarations" | ||
168 | lft.device.mVndk == rgt.device.mVndk | ||
169 | #pragma clang diagnostic pop | ||
170 | )) && | ||
166 | (lft.mType != SchemaType::FRAMEWORK || | 171 | (lft.mType != SchemaType::FRAMEWORK || |
167 | (lft.framework.mKernels == rgt.framework.mKernels && | 172 | (lft.framework.mKernels == rgt.framework.mKernels && |
168 | lft.framework.mSepolicy == rgt.framework.mSepolicy && | 173 | lft.framework.mSepolicy == rgt.framework.mSepolicy && |