diff options
author | Hsin-Yi Chen <hsinyichen@google.com> | 2019-06-20 23:42:48 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-20 23:42:48 -0700 |
commit | ff40d503b3bfdcc5f7d0ca5b2a3abd4d9305b058 (patch) | |
tree | ef87935750407065628323128870e53fb33c8e2a | |
parent | e740b50069069ae2a2661f7b4f10ae9e9d90ff5c (diff) | |
parent | 3aa7c19c0ab25a462b2c1fbe8893d7025bf1a1ce (diff) | |
download | vndk-ff40d503b3bfdcc5f7d0ca5b2a3abd4d9305b058.tar.gz |
Do not test the ELF objects not built for Android am: ae9db0ecb2 am: 81182ebfb4
am: 3aa7c19c0a
Change-Id: I659137451ad468e73a6a721b9eefbe171f1067d5
-rw-r--r-- | dependency/VtsVndkDependencyTest.py | 47 |
1 files changed, 46 insertions, 1 deletions
diff --git a/dependency/VtsVndkDependencyTest.py b/dependency/VtsVndkDependencyTest.py index 4878978..0302220 100644 --- a/dependency/VtsVndkDependencyTest.py +++ b/dependency/VtsVndkDependencyTest.py @@ -154,9 +154,48 @@ class VtsVndkDependencyTest(base_test.BaseTestClass): if target_file_utils.IsExecutable(permissions): return True - logging.debug("%s is not for application processor", target_path) return False + def _IsElfObjectBuiltForAndroid(self, elf, target_path): + """Checks whether an ELF object is built for Android. + + Some ELF objects in vendor partition require special program + interpreters. Such executable files have .interp sections, but shared + libraries don't. As there is no reliable way to identify those + libraries. This method checks .note.android.ident section which is + created by Android build system. + + Args: + elf: The object of elf_parser.ElfParser. + target_path: The path to the ELF file on target. + + Returns: + A boolean, whether the ELF object is built for Android. + """ + # b/133399940 Skip an ELF file if it does not have .note.android.ident + # section and meets one of the following conditions: + if elf.HasAndroidIdent(): + return True + + # It's in the specific directory and is a shared library. + if (target_path.startswith("/vendor/arib/lib/") and + ".so" in target_path and + elf.IsSharedObject()): + return False + + # It's in the specific directory, requires special program interpreter, + # and is executable. + if target_path.startswith("/vendor/arib/bin/"): + interp = elf.GetProgramInterpreter() + if interp and interp not in self._DEFAULT_PROGRAM_INTERPRETERS: + permissions = target_file_utils.GetPermission(target_path, + self._dut.shell) + if (elf.IsExecutable() or + target_file_utils.IsExecutable(permissions)): + return False + + return True + def _LoadElfObjects(self, host_dir, target_dir, abi_list, elf_error_handler): """Scans a host directory recursively and loads all ELF files in it. @@ -185,7 +224,13 @@ class VtsVndkDependencyTest(base_test.BaseTestClass): continue try: if not self._IsElfObjectForAp(elf, target_path, abi_list): + logging.info("%s is not for application processor", + target_path) continue + if not self._IsElfObjectBuiltForAndroid(elf, target_path): + logging.info("%s is not built for Android", target_path) + continue + deps = elf.ListDependencies() except elf_parser.ElfError as e: elf_error_handler(target_path, e) |