Re-land "Add SearchType to OpenSharedLibraryWithExtension."

samples/sample_util/SampleApplication.cpp

@@ -120,8 +120,8 @@ SampleApplication::SampleApplication(std::string name,
         mDriverType = angle::GLESDriverType::SystemWGL;
 #else
         mGLWindow = EGLWindow::New(glesMajorVersion, glesMinorVersion);
-        mEntryPointsLib.reset(
-            angle::OpenSharedLibraryWithExtension(angle::GetNativeEGLLibraryNameWithExtension()));
+        mEntryPointsLib.reset(angle::OpenSharedLibraryWithExtension(
+            angle::GetNativeEGLLibraryNameWithExtension(), angle::SearchType::SystemDir));
         mDriverType = angle::GLESDriverType::SystemEGL;
 #endif  // defined(ANGLE_PLATFORM_WINDOWS)
     }

src/common/system_utils.h

@@ -79,7 +79,7 @@ enum class SearchType
 };
 
 Library *OpenSharedLibrary(const char *libraryName, SearchType searchType);
-Library *OpenSharedLibraryWithExtension(const char *libraryName);
+Library *OpenSharedLibraryWithExtension(const char *libraryName, SearchType searchType);
 
 // Returns true if the process is currently being debugged.
 bool IsDebuggerAttached();

src/common/system_utils_posix.cpp

@@ -108,6 +108,12 @@ class PosixLibrary : public Library
 
 Library *OpenSharedLibrary(const char *libraryName, SearchType searchType)
 {
+    std::string nameWithExt = std::string(libraryName) + "." + GetSharedLibraryExtension();
+    return OpenSharedLibraryWithExtension(nameWithExt.c_str(), searchType);
+}
+
+Library *OpenSharedLibraryWithExtension(const char *libraryName, SearchType searchType)
+{
     std::string directory;
     if (searchType == SearchType::ApplicationDir)
     {
@@ -125,7 +131,7 @@ Library *OpenSharedLibrary(const char *libraryName, SearchType searchType)
         extraFlags = RTLD_NOLOAD;
     }
 
-    std::string fullPath = directory + libraryName + "." + GetSharedLibraryExtension();
+    std::string fullPath = directory + libraryName;
 #if ANGLE_PLATFORM_IOS
     // On iOS, dlopen needs a suffix on the framework name to work.
     fullPath = fullPath + "/" + libraryName;
@@ -133,11 +139,6 @@ Library *OpenSharedLibrary(const char *libraryName, SearchType searchType)
     return new PosixLibrary(fullPath, extraFlags);
 }
 
-Library *OpenSharedLibraryWithExtension(const char *libraryName)
-{
-    return new PosixLibrary(libraryName, 0);
-}
-
 bool IsDirectory(const char *filename)
 {
     struct stat st;

src/common/system_utils_win32.cpp

@@ -96,8 +96,8 @@ Library *OpenSharedLibrary(const char *libraryName, SearchType searchType)
     }
 }
 
-Library *OpenSharedLibraryWithExtension(const char *libraryName)
+Library *OpenSharedLibraryWithExtension(const char *libraryName, SearchType searchType)
 {
-    return new Win32Library(libraryName, SearchType::SystemDir);
+    return new Win32Library(libraryName, searchType);
 }
 }  // namespace angle

src/common/vulkan/BUILD.gn

@@ -7,6 +7,29 @@ import("../../../gni/angle.gni")
 
 assert(angle_enable_vulkan)
 
+declare_args() {
+  angle_use_custom_libvulkan = !is_android && !is_fuchsia && !is_ggp
+}
+
+config("angle_libvulkan_config") {
+  if (angle_use_custom_libvulkan) {
+    defines = [ "ANGLE_USE_CUSTOM_LIBVULKAN" ]
+  }
+}
+
+group("angle_libvulkan") {
+  public_configs = [ ":angle_libvulkan_config" ]
+  data_deps = []
+  if (angle_use_custom_libvulkan) {
+    if (angle_shared_libvulkan) {
+      data_deps += [ "$angle_vulkan_loader_dir:libvulkan" ]
+    } else {
+      public_deps = [ "$angle_vulkan_loader_dir:libvulkan" ]
+    }
+    data_deps += [ "$angle_vulkan_tools_dir:VkICD_mock_icd" ]
+  }
+}
+
 config("angle_vulkan_headers_config") {
   if (angle_shared_libvulkan) {
     defines = [ "ANGLE_SHARED_LIBVULKAN=1" ]
@@ -50,6 +73,7 @@ angle_source_set("vulkan") {
   ]
 
   public_deps = [
+    ":angle_libvulkan",
     ":angle_vulkan_entry_points",
     "$angle_root:angle_common",
   ]
@@ -64,15 +88,6 @@ angle_source_set("vulkan") {
   deps = []
   data_deps = []
 
-  if (!is_android && !is_fuchsia && !is_ggp) {
-    if (angle_shared_libvulkan) {
-      data_deps += [ "$angle_vulkan_loader_dir:libvulkan" ]
-    } else {
-      deps += [ "$angle_vulkan_loader_dir:libvulkan" ]
-    }
-    data_deps += [ "$angle_vulkan_tools_dir:VkICD_mock_icd" ]
-  }
-
   if (angle_enable_swiftshader) {
     import("$swiftshader_dir/src/Vulkan/vulkan.gni")
     _sws_icd = "./$swiftshader_icd_file_name"

src/gpu_info_util/SystemInfo_vulkan.cpp

@@ -25,6 +25,13 @@ const char *kLibVulkanNames[] = {"libvulkan.so", "libvulkan.so.1"};
 
 namespace angle
 {
+// On Android, Fuchsia and GGP we use the system libvulkan.
+#if defined(ANGLE_USE_CUSTOM_LIBVULKAN)
+constexpr SearchType kLibVulkanSearchType = SearchType::ApplicationDir;
+#else
+constexpr SearchType kLibVulkanSearchType = SearchType::SystemDir;
+#endif  // defined(ANGLE_USE_CUSTOM_LIBVULKAN)
+
 class VulkanLibrary final : NonCopyable
 {
   public:
@@ -47,7 +54,7 @@ class VulkanLibrary final : NonCopyable
     {
         for (const char *libraryName : kLibVulkanNames)
         {
-            mLibVulkan = OpenSharedLibraryWithExtension(libraryName);
+            mLibVulkan = OpenSharedLibraryWithExtension(libraryName, kLibVulkanSearchType);
             if (mLibVulkan)
             {
                 if (mLibVulkan->getNative())

src/tests/perf_tests/ANGLEPerfTest.cpp

@@ -605,8 +605,8 @@ ANGLERenderTest::ANGLERenderTest(const std::string &name,
         case angle::GLESDriverType::SystemEGL:
 #if defined(ANGLE_USE_UTIL_LOADER) && !defined(ANGLE_PLATFORM_WINDOWS)
             mGLWindow = EGLWindow::New(testParams.majorVersion, testParams.minorVersion);
-            mEntryPointsLib.reset(
-                angle::OpenSharedLibraryWithExtension(GetNativeEGLLibraryNameWithExtension()));
+            mEntryPointsLib.reset(angle::OpenSharedLibraryWithExtension(
+                GetNativeEGLLibraryNameWithExtension(), SearchType::SystemDir));
 #else
             std::cerr << "Not implemented." << std::endl;
             mSkipTest = true;

src/tests/test_utils/ANGLETest.cpp

@@ -1487,8 +1487,8 @@ Library *ANGLETestEnvironment::GetSystemEGLLibrary()
 #if defined(ANGLE_USE_UTIL_LOADER)
     if (!gSystemEGLLibrary)
     {
-        gSystemEGLLibrary.reset(
-            OpenSharedLibraryWithExtension(GetNativeEGLLibraryNameWithExtension()));
+        gSystemEGLLibrary.reset(OpenSharedLibraryWithExtension(
+            GetNativeEGLLibraryNameWithExtension(), SearchType::SystemDir));
     }
 #endif  // defined(ANGLE_USE_UTIL_LOADER)
     return gSystemEGLLibrary.get();

src/tests/test_utils/angle_test_instantiate.cpp

@@ -81,7 +81,8 @@ bool IsSystemEGLConfigSupported(const PlatformParameters &param, OSWindow *osWin
 #if defined(ANGLE_USE_UTIL_LOADER)
     std::unique_ptr<angle::Library> eglLibrary;
 
-    eglLibrary.reset(OpenSharedLibraryWithExtension(GetNativeEGLLibraryNameWithExtension()));
+    eglLibrary.reset(OpenSharedLibraryWithExtension(GetNativeEGLLibraryNameWithExtension(),
+                                                    SearchType::SystemDir));
 
     EGLWindow *eglWindow = EGLWindow::New(param.majorVersion, param.minorVersion);
     ConfigParameters configParams;