commit 992ef4ea06448a443fdba459ef4a034400b91e38
author Hsin-Yi Chen <hsinyichen@google.com> Wed Jun 16 02:02:06 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 16 02:02:06 2021 +0000
tree ee3cc3d3c59597a66d77e2c5dede731fc2135234
parent 007f0eba35862e9a1cff5d174200c056e6675505
parent be7ff1ed4da4b0844ba92e5829f476d777fe0d09

Merge "Allow dependencies on non-default link paths" am: be7ff1ed4d

Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/1737433

Change-Id: I5224052106486416fe8553aa8adbb0e9615115d1

dependency/vts_vndk_dependency_test.py

diff --git a/dependency/vts_vndk_dependency_test.py b/dependency/vts_vndk_dependency_test.py
index 22490fa..9edb7d1 100644
--- a/dependency/vts_vndk_dependency_test.py
+++ b/dependency/vts_vndk_dependency_test.py
@@ -44,8 +44,12 @@
                  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 = "/"
@@ -61,6 +65,9 @@
         "/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"
     ]
@@ -364,7 +371,7 @@
         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)):
@@ -375,8 +382,8 @@
 
         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()