Snap for 7856077 from 6b502cbdb4ef26a23cce25875c68fe460305bd76 to android12-tests-releaseandroid-vts-12.0_r2android-cts-12.0_r2

Change-Id: Id0cd4c813388444b98b23ffc6984daab85e675ff

2 files changed, 25 insertions, 11 deletions

diff --git a/dependency/VtsVndkDependencyTest.py b/dependency/VtsVndkDependencyTest.py
index f99e670..6a385c7 100644
--- a/dependency/VtsVndkDependencyTest.py
+++ b/dependency/VtsVndkDependencyTest.py
@@ -51,8 +51,12 @@ class VtsVndkDependencyTest(base_test.BaseTestClass):
                  expected to be in /vendor/lib[64].
         _vndk: Set of strings. The names of VNDK-core libraries.
         _vndk_sp: Set of strings. The names of VNDK-SP libraries.
-        _SP_HAL_LINK_PATHS: Format strings of same-process HAL's link paths.
-        _VENDOR_LINK_PATHS: Format strings of vendor processes' link paths.
+        _SP_HAL_LINK_PATHS: Format strings of same-process HAL's default link
+                            paths.
+        _VENDOR_LINK_PATHS: Format strings of vendor processes' default link
+                            paths.
+        _VENDOR_PERMITTED_PATHS: Same-process HAL and vendor processes'
+                                 permitted link paths.
     """
     _TARGET_DIR_SEP = "/"
     _TARGET_ROOT_DIR = "/"
@@ -67,6 +71,9 @@ class VtsVndkDependencyTest(base_test.BaseTestClass):
         "/odm/{LIB}/hw", "/odm/{LIB}/egl", "/odm/{LIB}",
         "/vendor/{LIB}/hw", "/vendor/{LIB}/egl", "/vendor/{LIB}"
     ]
+    _VENDOR_PERMITTED_PATHS = [
+        "/odm", "/vendor"
+    ]
     _DEFAULT_PROGRAM_INTERPRETERS = [
         "/system/bin/linker", "/system/bin/linker64"
     ]
@@ -345,8 +352,8 @@ class VtsVndkDependencyTest(base_test.BaseTestClass):
 
         vendor_link_paths = [vndk_utils.FormatVndkPath(x, bitness) for
                              x in self._VENDOR_LINK_PATHS]
-        vendor_namespace = self._FindLibsInLinkPaths(bitness,
-                                                     vendor_link_paths, objs)
+        vendor_namespace = self._FindLibsInLinkPaths(
+            bitness, self._VENDOR_PERMITTED_PATHS, objs)
         # Exclude VNDK and VNDK-SP extensions from vendor libraries.
         for vndk_ext_dir in (vndk_utils.GetVndkExtDirectories(bitness) +
                              vndk_utils.GetVndkSpExtDirectories(bitness)):
@@ -357,8 +364,8 @@ class VtsVndkDependencyTest(base_test.BaseTestClass):
 
         sp_hal_link_paths = [vndk_utils.FormatVndkPath(x, bitness) for
                              x in self._SP_HAL_LINK_PATHS]
-        sp_hal_namespace = self._FindLibsInLinkPaths(bitness,
-                                                     sp_hal_link_paths, objs)
+        sp_hal_namespace = self._FindLibsInLinkPaths(
+            bitness, self._VENDOR_PERMITTED_PATHS, objs)
 
         # Find same-process HAL and dependencies
         sp_hal_libs = set()
diff --git a/dependency/vts_vndk_dependency_test.py b/dependency/vts_vndk_dependency_test.py
index ff62885..0c13c41 100644
--- a/dependency/vts_vndk_dependency_test.py
+++ b/dependency/vts_vndk_dependency_test.py
@@ -46,8 +46,12 @@ class VtsVndkDependencyTest(unittest.TestCase):
                  expected to be in /vendor/lib[64].
         _vndk: Set of strings. The names of VNDK-core libraries.
         _vndk_sp: Set of strings. The names of VNDK-SP libraries.
-        _SP_HAL_LINK_PATHS: Format strings of same-process HAL's link paths.
-        _VENDOR_LINK_PATHS: Format strings of vendor processes' link paths.
+        _SP_HAL_LINK_PATHS: Format strings of same-process HAL's default link
+                            paths.
+        _VENDOR_LINK_PATHS: Format strings of vendor processes' default link
+                            paths.
+        _VENDOR_PERMITTED_PATHS: Same-process HAL and vendor processes'
+                                 permitted link paths.
         _VENDOR_APP_DIRS: The app directories in vendor partitions.
     """
     _TARGET_DIR_SEP = "/"
@@ -63,6 +67,9 @@ class VtsVndkDependencyTest(unittest.TestCase):
         "/odm/{LIB}/hw", "/odm/{LIB}/egl", "/odm/{LIB}",
         "/vendor/{LIB}/hw", "/vendor/{LIB}/egl", "/vendor/{LIB}"
     ]
+    _VENDOR_PERMITTED_PATHS = [
+        "/odm", "/vendor"
+    ]
     _VENDOR_APP_DIRS = [
         "/vendor/app", "/vendor/priv-app", "/odm/app", "/odm/priv-app"
     ]
@@ -366,7 +373,7 @@ class VtsVndkDependencyTest(unittest.TestCase):
         vendor_link_paths = [vndk_utils.FormatVndkPath(x, bitness) for
                              x in self._VENDOR_LINK_PATHS]
         vendor_namespace = self._FindLibsInLinkPaths(
-            bitness, vendor_link_paths + self._VENDOR_APP_DIRS, objs)
+            bitness, self._VENDOR_PERMITTED_PATHS, objs)
         # Exclude VNDK and VNDK-SP extensions from vendor libraries.
         for vndk_ext_dir in (vndk_utils.GetVndkExtDirectories(bitness) +
                              vndk_utils.GetVndkSpExtDirectories(bitness)):
@@ -377,8 +384,8 @@ class VtsVndkDependencyTest(unittest.TestCase):
 
         sp_hal_link_paths = [vndk_utils.FormatVndkPath(x, bitness) for
                              x in self._SP_HAL_LINK_PATHS]
-        sp_hal_namespace = self._FindLibsInLinkPaths(bitness,
-                                                     sp_hal_link_paths, objs)
+        sp_hal_namespace = self._FindLibsInLinkPaths(
+            bitness, self._VENDOR_PERMITTED_PATHS, objs)
 
         # Find same-process HAL and dependencies
         sp_hal_libs = set()