diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-30 04:19:28 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-30 04:19:28 +0000 |
| commit | 72fac9270b0298c0c6cca375d2e0c72b60574af9 (patch) | |
| tree | 133e2002c0b4165eb9e1d6233e4b8a864d38894c | |
| parent | 11e3cbb75aca9a2379e1bbcc5dcd3903dbe46d6c (diff) | |
| parent | 432602aa51bde21e65e23aa73c43cbbac752029b (diff) | |
| download | vndk-72fac9270b0298c0c6cca375d2e0c72b60574af9.tar.gz | |
Snap for 11155123 from 432602aa51bde21e65e23aa73c43cbbac752029b to mainline-permission-releaseaml_per_341410020android14-mainline-permission-release
Change-Id: I1a5be6e865c7815e7a5c80b76ffa4afcd2b9f02c
| -rw-r--r-- | abi/vts_vndk_abi_test.py | 9 | ||||
| -rw-r--r-- | golden/vndk_data.py | 5 |
2 files changed, 12 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/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" |