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

Merge "Remove workaround to find the latest lsdump files"

Browse Source
This commit is contained in:
Logan Chien
2019-03-04 06:07:09 +00:00
committed by Gerrit Code Review
parent 4ea092ebee 7d382da66e
commit e74a73a610
1 changed files with 2 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
vndk/tools/header-checker/utils/create_reference_dumps.py
View File

@@ -65,39 +65,6 @@ def get_lib_arch_str(target):
return target.arch + target_arch_variant_str return target.arch + target_arch_variant_str
# FIXME (b/121986692): Before aosp/858259 is merged, apex mutator adds
# `_platform` suffix if the module is used by some apex modules. This
# workaround searches for lsdump with and without `_platform`.
_WORKAROUND_APEX_PLATFORM_LSDUMPS = True
if _WORKAROUND_APEX_PLATFORM_LSDUMPS:
def _find_lib_lsdumps_workaround(dir_name, lsdump_paths, libs):
dir_name_platform = dir_name + '_platform'
matched_lsdump_paths = set(find_lib_lsdumps(
dir_name, lsdump_paths, libs))
matched_lsdump_paths_platform = set(find_lib_lsdumps(
dir_name_platform, lsdump_paths, libs))
# Pick the lsdump file with latest modification time if both of them
# exist.
matched_lsdump_paths_replaced = set(
path.replace(dir_name, dir_name_platform)
for path in matched_lsdump_paths)
both = matched_lsdump_paths_replaced & matched_lsdump_paths_platform
for path_platform in both:
path = path_platform.replace(dir_name_platform, dir_name)
if os.stat(path).st_mtime >= os.stat(path_platform).st_mtime:
matched_lsdump_paths_platform.remove(path_platform)
else:
matched_lsdump_paths.remove(path)
return sorted(matched_lsdump_paths | matched_lsdump_paths_platform)
def find_and_copy_lib_lsdumps(target, ref_dump_dir_stem, ref_dump_dir_insertion, def find_and_copy_lib_lsdumps(target, ref_dump_dir_stem, ref_dump_dir_insertion,
core_or_vendor_shared_str, libs, lsdump_paths, core_or_vendor_shared_str, libs, lsdump_paths,
compress): compress):
@@ -105,12 +72,8 @@ def find_and_copy_lib_lsdumps(target, ref_dump_dir_stem, ref_dump_dir_insertion,
target.arch, target.arch_variant, target.cpu_variant, target.arch, target.arch_variant, target.cpu_variant,
core_or_vendor_shared_str) core_or_vendor_shared_str)
if _WORKAROUND_APEX_PLATFORM_LSDUMPS: arch_lsdump_paths = find_lib_lsdumps(
arch_lsdump_paths = _find_lib_lsdumps_workaround( module_variant_dir_name, lsdump_paths, libs)
module_variant_dir_name, lsdump_paths, libs)
else:
arch_lsdump_paths = find_lib_lsdumps(
module_variant_dir_name, lsdump_paths, libs)
# Copy the contents of the lsdump into their corresponding reference ABI # Copy the contents of the lsdump into their corresponding reference ABI
# dumps directories. # dumps directories.