Revert "Generate libvulkan.so.1 on Linux instead of libvulkan.so"
authorShahbaz Youssefi <shabbyx@gmail.com>
Fri, 30 Oct 2020 05:21:10 +0000 (01:21 -0400)
committerLenny Komow <lenny@lunarg.com>
Fri, 30 Oct 2020 17:47:06 +0000 (11:47 -0600)
Causes Chromium to pick up ANGLE's build of Vulkan-Loader instead of the
system one, with the caveat that the gn build of Vulkan-Loader doesn't
support VK_KHR_xlib_surface which Chromium depends on.

This change can be re-introduced once Chromium switches to
VK_KHR_xcb_surface.

This reverts commit 8308d6744d50e4dc357e60282436f6ec0942b8c8.

BUILD.gn

index 6cfeb30d658cf11c1093b0edbde889bc4e29efff..671295fc3752e27024ed9213849db0754af8b3cf 100644 (file)
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -173,10 +173,14 @@ if (!is_android) {
 
       runtime_deps = [ "//sdk/lib/fdio:fdio_sdk" ]
     }
+  }
+
+  if (is_linux && vulkan_loader_shared) {
+    copy("libvulkan-abi1") {
+      sources = [ "${root_out_dir}/libvulkan.so" ]
+      outputs = [ "${root_out_dir}/libvulkan.so.1" ]
 
-    # Create libvulkan.so.1 on Linux instead of libvulkan.so
-    if (is_linux && vulkan_loader_shared) {
-      output_extension = "so.1"
+      deps = [ ":libvulkan" ]
     }
   }
 }