diff options
| author | Hsin-Yi Chen <hsinyichen@google.com> | 2024-04-16 08:51:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-16 08:51:02 +0000 |
| commit | d05e0962cc9de9908fbf320a514de5beebec3c7c (patch) | |
| tree | b2473290850f5cb17de9b2cd3cdb66f033a61f0c | |
| parent | 957b2b6912f82bebfcd71ac732138c3000af7f12 (diff) | |
| parent | 75fa01f5270c0cb4e2251867deed347012a47864 (diff) | |
| download | development-d05e0962cc9de9908fbf320a514de5beebec3c7c.tar.gz | |
Merge "Create reference dumps from .so.apex.lsdump" into main
| -rwxr-xr-x | vndk/tools/header-checker/utils/create_reference_dumps.py | 4 | ||||
| -rw-r--r-- | vndk/tools/header-checker/utils/utils.py | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/vndk/tools/header-checker/utils/create_reference_dumps.py b/vndk/tools/header-checker/utils/create_reference_dumps.py index 6cba65ac8..9efb7cee0 100755 --- a/vndk/tools/header-checker/utils/create_reference_dumps.py +++ b/vndk/tools/header-checker/utils/create_reference_dumps.py @@ -14,7 +14,7 @@ PRODUCTS_DEFAULT = ['aosp_arm', 'aosp_arm64', 'aosp_x86', 'aosp_x86_64'] PREBUILTS_ABI_DUMPS_DIR = os.path.join(AOSP_DIR, 'prebuilts', 'abi-dumps') PREBUILTS_ABI_DUMPS_SUBDIRS = ('ndk', 'platform', 'vndk') -KNOWN_TAGS = {'LLNDK', 'NDK', 'PLATFORM', 'VENDOR', 'PRODUCT'} +KNOWN_TAGS = {'APEX', 'LLNDK', 'NDK', 'PLATFORM', 'VENDOR', 'PRODUCT'} NON_AOSP_TAGS = {'VENDOR', 'PRODUCT'} SOONG_DIR = os.path.join(AOSP_DIR, 'out', 'soong', '.intermediates') @@ -70,7 +70,7 @@ def tag_to_dir_name(tag): return '' if tag == 'NDK': return 'ndk' - if tag == 'PLATFORM': + if tag in ('APEX', 'PLATFORM'): return 'platform' if tag == 'LLNDK': return 'vndk' diff --git a/vndk/tools/header-checker/utils/utils.py b/vndk/tools/header-checker/utils/utils.py index 0d032c2ef..a7d54e6fe 100644 --- a/vndk/tools/header-checker/utils/utils.py +++ b/vndk/tools/header-checker/utils/utils.py @@ -29,7 +29,11 @@ BUILTIN_HEADERS_DIR = ( SO_EXT = '.so' SOURCE_ABI_DUMP_EXT_END = '.lsdump' SOURCE_ABI_DUMP_EXT = SO_EXT + SOURCE_ABI_DUMP_EXT_END -LLNDK_ABI_DUMP_EXT = SO_EXT + '.llndk' + SOURCE_ABI_DUMP_EXT_END +KNOWN_ABI_DUMP_EXTS = { + SOURCE_ABI_DUMP_EXT, + SO_EXT + '.apex' + SOURCE_ABI_DUMP_EXT_END, + SO_EXT + '.llndk' + SOURCE_ABI_DUMP_EXT_END, +} DEFAULT_CPPFLAGS = ['-x', 'c++', '-std=c++11'] DEFAULT_CFLAGS = ['-std=gnu99'] @@ -85,7 +89,7 @@ class Arch(object): def _strip_dump_name_ext(filename): """Remove .so*.lsdump from a file name.""" - for ext in (SOURCE_ABI_DUMP_EXT, LLNDK_ABI_DUMP_EXT): + for ext in KNOWN_ABI_DUMP_EXTS: if filename.endswith(ext) and len(filename) > len(ext): return filename[:-len(ext)] raise ValueError(f'{filename} has an unknown file name extension.') @@ -206,7 +210,7 @@ def _get_module_variant_dir_name(tag, arch_cpu_str): For example, android_x86_shared, android_vendor.R_arm_armv7-a-neon_shared. """ - if tag in ('LLNDK', 'NDK', 'PLATFORM'): + if tag in ('LLNDK', 'NDK', 'PLATFORM', 'APEX'): return f'android_{arch_cpu_str}_shared' if tag == 'VENDOR': return f'android_vendor_{arch_cpu_str}_shared' |