LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Handle lsdump paths containing soong config hash" into main

Browse Source
This commit is contained in:
Hsin-Yi Chen
2023-07-28 03:20:47 +00:00
committed by Gerrit Code Review
parent 5e1afb9e78 04cf4d41e9
commit 7d300d7652
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vndk/tools/header-checker/utils/utils.py
View File

@@ -228,20 +228,28 @@ def _read_lsdump_paths(lsdump_paths_file_path, vndk_version, targets,
tag, path = (x.strip() for x in line.split(':', 1))
if not path or tag in exclude_tags:
continue
dirname, filename = os.path.split(path)
dir_path, filename = os.path.split(path)
if not filename.endswith(SOURCE_ABI_DUMP_EXT):
continue
libname = filename[:-len(SOURCE_ABI_DUMP_EXT)]
if not libname:
continue
variant = os.path.basename(dirname)
if not variant:
continue
# dir_path may contain soong config hash.
# For example, the following dir_paths are valid.
# android_x86_x86_64_shared/012abc/libc.so.lsdump
# android_x86_x86_64_shared/libc.so.lsdump
dirnames = []
dir_path, dirname = os.path.split(dir_path)
dirnames.append(dirname)
dirname = os.path.basename(dir_path)
dirnames.append(dirname)
for target in targets:
arch_cpu = target.get_arch_cpu_str()
prefix = _get_module_variant_dir_name(tag, vndk_version,
arch_cpu)
if not variant.startswith(prefix):
variant = next((d for d in dirnames if d.startswith(prefix)),
None)
if not variant:
continue
new_suffix = variant[len(prefix):]
old_suffix = suffixes[libname].get(arch_cpu)