diff options
| -rw-r--r-- | abi/vts_vndk_abi_test.py | 9 | ||||
| -rw-r--r-- | files/vts_vndk_files_test.py | 7 | ||||
| -rw-r--r-- | golden/vndk_data.py | 5 |
3 files changed, 19 insertions, 2 deletions
diff --git a/abi/vts_vndk_abi_test.py b/abi/vts_vndk_abi_test.py index 140c1c4..85627a3 100644 --- a/abi/vts_vndk_abi_test.py +++ b/abi/vts_vndk_abi_test.py @@ -314,6 +314,15 @@ class VtsVndkAbiTest(unittest.TestCase): dump_version = self._dut.GetVndkVersion() self.assertTrue(dump_version, "Cannot determine VNDK version.") + # VNDK 35 will not be frozen. + try: + if int(dump_version) > 34: + logging.info("Skip the test. version: %s ABI: %s bitness: %d", + dump_version, primary_abi, bitness) + return + except ValueError: + pass + dump_paths = vndk_data.GetAbiDumpPathsFromResources( dump_version, binder_bitness, diff --git a/files/vts_vndk_files_test.py b/files/vts_vndk_files_test.py index faa3e6a..99f8598 100644 --- a/files/vts_vndk_files_test.py +++ b/files/vts_vndk_files_test.py @@ -130,6 +130,13 @@ class VtsVndkFilesTest(unittest.TestCase): logging.info("Skip the test as VNDK runtime is not enforced on " "the device.") return + try: + if int(self._vndk_version) > 34: + logging.info("Skip the test as VNDK %s should be installed in " + "vendor partition.", self._vndk_version) + return + except ValueError: + pass self._TestVndkDirectory( vndk_utils.GetVndkDirectory(bitness, self._vndk_version), (vndk_data.VNDK, vndk_data.VNDK_PRIVATE, vndk_data.VNDK_SP, diff --git a/golden/vndk_data.py b/golden/vndk_data.py index cf0cd59..a35c1c0 100644 --- a/golden/vndk_data.py +++ b/golden/vndk_data.py @@ -198,8 +198,9 @@ def LoadVndkLibraryListsFromResources(version, *tags): logging.error("Could not import resources module.") return None - version_str = (version if version and re.match("\\d+", version) else - "current") + # VNDK 35 will not be frozen. + version_str = (version if re.match("\\d+", version) and int(version) <= 34 + else "current") vndk_lib_list_name = version_str + ".txt" vndk_lib_extra_list_name = "vndk-lib-extra-list-" + version_str + ".txt" |