1 files changed, 6 insertions, 0 deletions
diff --git a/treble/vintf/DeviceMatrixTest.cpp b/treble/vintf/DeviceMatrixTest.cpp
index 1f9b7121..fa4c2d23 100644
--- a/treble/vintf/DeviceMatrixTest.cpp
+++ b/treble/vintf/DeviceMatrixTest.cpp
@@ -69,10 +69,16 @@ TEST_F(DeviceMatrixTest, VndkVersion) {
     ASSERT_LE(syspropVndkVersionNumber, __ANDROID_API_V__)
         << kVndkVersionProp << " must be less or equal than "
         << __ANDROID_API_V__;
+
+    if (syspropVndkVersionNumber == __ANDROID_API_V__) {
+      GTEST_SKIP()
+          << "VNDK version 35 may not have matching VINTF VNDK version.";
+    }
   }
 
   ASSERT_NE("", syspropVndkVersion)
       << kVndkVersionProp << " must not be empty.";
+
   std::string vintfVndkVersion = vendor_matrix_->getVendorNdkVersion();
   ASSERT_NE("", vintfVndkVersion)
       << "Device compatibility matrix does not declare proper VNDK version.";