Snap for 4714045 from 4825b7913469289fc0fde134e48a32ce9f289b9e to oreo-mr1-vts-release
Change-Id: I9ba512079e90537132070b3b87fd1fc23956159c
diff --git a/dependency/VtsVndkDependencyTest.py b/dependency/VtsVndkDependencyTest.py
index 4ccea2a..8a35dee 100644
--- a/dependency/VtsVndkDependencyTest.py
+++ b/dependency/VtsVndkDependencyTest.py
@@ -29,6 +29,7 @@
from vts.utils.python.file import target_file_utils
from vts.utils.python.library import elf_parser
from vts.utils.python.os import path_utils
+from vts.utils.python.vndk import vndk_utils
class VtsVndkDependencyTest(base_test.BaseTestClass):
@@ -47,8 +48,6 @@
libraries in /system/lib[64].
"""
_TARGET_VENDOR_DIR = "/vendor"
- _TARGET_VNDK_SP_DIR_32 = "/system/lib/vndk-sp"
- _TARGET_VNDK_SP_DIR_64 = "/system/lib64/vndk-sp"
# copied from development/vndk/tools/definition-tool/vndk_definition_tool.py
_LOW_LEVEL_NDK = [
@@ -172,10 +171,6 @@
return True
return False
- def _getTargetVndkSpDir(self, bitness):
- """Returns 32/64-bit vndk-sp directory path on target device."""
- return getattr(self, "_TARGET_VNDK_SP_DIR_" + str(bitness))
-
def _getSpHalLinkPaths(self, bitness):
"""Returns 32/64-bit same-process HAL link paths"""
return getattr(self, "_SP_HAL_LINK_PATHS_" + str(bitness))
@@ -236,7 +231,8 @@
List of tuples (path, dependency_names). The library with
disallowed dependencies and list of the dependencies.
"""
- vndk_sp_dir = self._getTargetVndkSpDir(bitness)
+ vndk_sp_dir = vndk_utils.GetVndkSpDirectory(bitness,
+ self._dut.vndk_version)
vndk_sp_paths = target_file_utils.FindFiles(self._shell, vndk_sp_dir,
"*.so")
vndk_sp_names = set(
