StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Migrate check_elf_file.py to python3"

Browse Source
This commit is contained in:
Spandan Das
2022-10-27 16:46:18 +00:00
committed by Gerrit Code Review
parent eef714a380 60b8195c83
commit 03b846ff37
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

@@ -614,7 +614,7 @@ TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)
JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar
DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar
FAT16COPY := build/make/tools/fat16copy.py FAT16COPY := build/make/tools/fat16copy.py
CHECK_ELF_FILE := build/make/tools/check_elf_file.py CHECK_ELF_FILE := $(HOST_OUT_EXECUTABLES)/check_elf_file$(HOST_EXECUTABLE_SUFFIX)
LPMAKE := $(HOST_OUT_EXECUTABLES)/lpmake$(HOST_EXECUTABLE_SUFFIX) LPMAKE := $(HOST_OUT_EXECUTABLES)/lpmake$(HOST_EXECUTABLE_SUFFIX)
ADD_IMG_TO_TARGET_FILES := $(HOST_OUT_EXECUTABLES)/add_img_to_target_files$(HOST_EXECUTABLE_SUFFIX) ADD_IMG_TO_TARGET_FILES := $(HOST_OUT_EXECUTABLES)/add_img_to_target_files$(HOST_EXECUTABLE_SUFFIX)
BUILD_IMAGE := $(HOST_OUT_EXECUTABLES)/build_image$(HOST_EXECUTABLE_SUFFIX) BUILD_IMAGE := $(HOST_OUT_EXECUTABLES)/build_image$(HOST_EXECUTABLE_SUFFIX)

5
tools/Android.bp
View File

@@ -59,3 +59,8 @@ python_binary_host {
name: "check_radio_versions", name: "check_radio_versions",
srcs: ["check_radio_versions.py"], srcs: ["check_radio_versions.py"],
} }
python_binary_host {
name: "check_elf_file",
srcs: ["check_elf_file.py"],
}

10
tools/check_elf_file.py
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# #
# Copyright (C) 2019 The Android Open Source Project # Copyright (C) 2019 The Android Open Source Project
# #
@@ -196,11 +196,7 @@ class ELFParser(object):
def _read_llvm_readobj(cls, elf_file_path, header, llvm_readobj): def _read_llvm_readobj(cls, elf_file_path, header, llvm_readobj):
"""Run llvm-readobj and parse the output.""" """Run llvm-readobj and parse the output."""
cmd = [llvm_readobj, '--dynamic-table', '--dyn-symbols', elf_file_path] cmd = [llvm_readobj, '--dynamic-table', '--dyn-symbols', elf_file_path]
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) out = subprocess.check_output(cmd, text=True)
out, _ = proc.communicate()
rc = proc.returncode
if rc != 0:
raise subprocess.CalledProcessError(rc, cmd, out)
lines = out.splitlines() lines = out.splitlines()
return cls._parse_llvm_readobj(elf_file_path, header, lines) return cls._parse_llvm_readobj(elf_file_path, header, lines)
@@ -467,7 +463,7 @@ class Checker(object):
"""Check whether all undefined symbols are resolved to a definition.""" """Check whether all undefined symbols are resolved to a definition."""
all_elf_files = [self._file_under_test] + self._shared_libs all_elf_files = [self._file_under_test] + self._shared_libs
missing_symbols = [] missing_symbols = []
for sym, imported_vers in self._file_under_test.imported.iteritems(): for sym, imported_vers in self._file_under_test.imported.items():
for imported_ver in imported_vers: for imported_ver in imported_vers:
lib = self._find_symbol_from_libs(all_elf_files, sym, imported_ver) lib = self._find_symbol_from_libs(all_elf_files, sym, imported_ver)
if not lib: if not lib: