diff options
author | Hsin-Yi Chen <hsinyichen@google.com> | 2019-01-07 18:04:39 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-07 18:04:39 -0800 |
commit | a5db0f348e91c327b70bc53e2b5a0d86694dc317 (patch) | |
tree | a56595465781fbd1c837eef607eb483fdfdbdeee | |
parent | b014f8f1d43becbe12832a3ca903cd8a2f7d3d60 (diff) | |
parent | 106519795cca0a341c42d98ae56957615a43bb9f (diff) | |
download | vndk-a5db0f348e91c327b70bc53e2b5a0d86694dc317.tar.gz |
Merge "Do not test ELF files that require special program interpreter" into pie-vts-devandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r37android-9.0.0_r36pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-b4s4-dev
am: 106519795c
Change-Id: If6de727f532ce4607bb30d284398bf4fce944ac9
-rw-r--r-- | dependency/VtsVndkDependencyTest.py | 43 |
1 files changed, 39 insertions, 4 deletions
diff --git a/dependency/VtsVndkDependencyTest.py b/dependency/VtsVndkDependencyTest.py index 76c6244..094d84a 100644 --- a/dependency/VtsVndkDependencyTest.py +++ b/dependency/VtsVndkDependencyTest.py @@ -65,6 +65,9 @@ class VtsVndkDependencyTest(base_test.BaseTestClass): "/odm/{LIB}/hw", "/odm/{LIB}/egl", "/odm/{LIB}", "/vendor/{LIB}/hw", "/vendor/{LIB}/egl", "/vendor/{LIB}" ] + _DEFAULT_PROGRAM_INTERPRETERS = [ + "/system/bin/linker", "/system/bin/linker64" + ] class ElfObject(object): """Contains dependencies of an ELF file on target device. @@ -124,6 +127,40 @@ class VtsVndkDependencyTest(base_test.BaseTestClass): logging.info("Delete %s", self._temp_dir) shutil.rmtree(self._temp_dir) + def _IsElfObjectForAp(self, elf, target_path, abi_list): + """Checks whether an ELF object is for application processor. + + Args: + elf: The object of elf_parser.ElfParser. + target_path: The path to the ELF file on target. + abi_list: A list of strings, the ABIs of the application processor. + + Returns: + A boolean, whether the ELF object is for application processor. + """ + if not any(elf.MatchCpuAbi(x) for x in abi_list): + logging.debug("%s does not match the ABI", target_path) + return False + + # b/115567177 Skip an ELF file if it meets the following 3 conditions: + # The ELF type is executable. + if not elf.IsExecutable(): + return True + + # It requires special program interpreter. + interp = elf.GetProgramInterpreter() + if not interp or interp in self._DEFAULT_PROGRAM_INTERPRETERS: + return True + + # It does not have execute permission in the file system. + permissions = target_file_utils.GetPermission(target_path, + self._dut.shell) + if target_file_utils.IsExecutable(permissions): + return True + + logging.debug("%s is not for application processor", target_path) + return False + def _LoadElfObjects(self, host_dir, target_dir, abi_list, elf_error_handler): """Scans a host directory recursively and loads all ELF files in it. @@ -150,11 +187,9 @@ class VtsVndkDependencyTest(base_test.BaseTestClass): except elf_parser.ElfError: logging.debug("%s is not an ELF file", target_path) continue - if not any(elf.MatchCpuAbi(x) for x in abi_list): - logging.debug("%s does not match the ABI", target_path) - elf.Close() - continue try: + if not self._IsElfObjectForAp(elf, target_path, abi_list): + continue deps = elf.ListDependencies() except elf_parser.ElfError as e: elf_error_handler(target_path, e) |