diff options
| author | 2020-09-28 04:13:26 +0000 | |
|---|---|---|
| committer | 2020-09-28 04:13:26 +0000 | |
| commit | 8abf06faa45959bd891ac2c49fdc99a060014c83 (patch) | |
| tree | 6f383454d29a486fe2741df2987241bcb48406f6 | |
| parent | 208b59c42f2a99a6d92c2cf3c69fa4c17f241924 (diff) | |
| parent | 751a987bccc252b5b8855124d8a37cb660ead463 (diff) | |
Exclude system shared libs from fix suggestion am: 751a987bcc
Original change: https://android-review.googlesource.com/c/platform/build/+/1190333
Change-Id: Ie9ff04af02f76aa0aafd934aa1cb8d13b041bdd0
| -rw-r--r-- | core/check_elf_file.mk | 3 | ||||
| -rwxr-xr-x | tools/check_elf_file.py | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/core/check_elf_file.mk b/core/check_elf_file.mk index d54a5b70ba..b5be81f9d7 100644 --- a/core/check_elf_file.mk +++ b/core/check_elf_file.mk @@ -14,12 +14,14 @@ # - my_installed_module_stem # - my_prebuilt_src_file # - my_check_elf_file_shared_lib_files +# - my_system_shared_libraries ifndef LOCAL_IS_HOST_MODULE ifneq ($(filter $(LOCAL_MODULE_CLASS),SHARED_LIBRARIES EXECUTABLES NATIVE_TESTS),) check_elf_files_stamp := $(intermediates)/check_elf_files.timestamp $(check_elf_files_stamp): PRIVATE_SONAME := $(if $(filter $(LOCAL_MODULE_CLASS),SHARED_LIBRARIES),$(my_installed_module_stem)) $(check_elf_files_stamp): PRIVATE_ALLOW_UNDEFINED_SYMBOLS := $(LOCAL_ALLOW_UNDEFINED_SYMBOLS) +$(check_elf_files_stamp): PRIVATE_SYSTEM_SHARED_LIBRARIES := $(my_system_shared_libraries) # PRIVATE_SHARED_LIBRARY_FILES are file paths to built shared libraries. # In addition to $(my_check_elf_file_shared_lib_files), some file paths are # added by `resolve-shared-libs-for-elf-file-check` from `core/main.mk`. @@ -33,6 +35,7 @@ $(check_elf_files_stamp): $(my_prebuilt_src_file) $(my_check_elf_file_shared_lib --skip-unknown-elf-machine \ $(if $(PRIVATE_SONAME),--soname $(PRIVATE_SONAME)) \ $(foreach l,$(PRIVATE_SHARED_LIBRARY_FILES),--shared-lib $(l)) \ + $(foreach l,$(PRIVATE_SYSTEM_SHARED_LIBRARIES),--system-shared-lib $(l)) \ $(if $(PRIVATE_ALLOW_UNDEFINED_SYMBOLS),--allow-undefined-symbols) \ --llvm-readobj=$(LLVM_READOBJ) \ $< diff --git a/tools/check_elf_file.py b/tools/check_elf_file.py index ee8efd502a..1ff8e65e7a 100755 --- a/tools/check_elf_file.py +++ b/tools/check_elf_file.py @@ -397,7 +397,7 @@ class Checker(object): sys.exit(2) - def check_dt_needed(self): + def check_dt_needed(self, system_shared_lib_names): """Check whether all DT_NEEDED entries are specified in the build system.""" @@ -417,6 +417,11 @@ class Checker(object): dt_needed = sorted(set(self._file_under_test.dt_needed)) modules = [re.sub('\\.so$', '', lib) for lib in dt_needed] + # Remove system shared libraries from the suggestion since they are added + # by default. + modules = [name for name in modules + if name not in system_shared_lib_names] + self._note() self._note('Fix suggestions:') self._note( @@ -502,6 +507,11 @@ def _parse_args(): parser.add_argument('--shared-lib', action='append', default=[], help='Path to shared library dependencies') + # System Shared library names + parser.add_argument('--system-shared-lib', action='append', default=[], + help='System shared libraries to be hidden from fix ' + 'suggestions') + # Check options parser.add_argument('--skip-bad-elf-magic', action='store_true', help='Ignore the input file without the ELF magic word') @@ -535,7 +545,7 @@ def main(): if args.soname: checker.check_dt_soname(args.soname) - checker.check_dt_needed() + checker.check_dt_needed(args.system_shared_lib) if not args.allow_undefined_symbols: checker.check_symbols() |