meson: fix android vulkan build

[mesa.git] / src / vulkan / wsi / meson.build

diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build
index 41e9c27ce8d29f21cdb8327ef6f6e1f0a97ed60e..687f5894882e47fcdb1dbcd48f05655f60c4e698 100644 (file)
--- a/src/vulkan/wsi/meson.build
+++ b/src/vulkan/wsi/meson.build
@@ -18,28 +18,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-vulkan_wsi_args = []
-vulkan_wsi_deps = []
-
 files_vulkan_wsi = files('wsi_common.c')
 
 if with_platform_x11
-  vulkan_wsi_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR']
-  vulkan_wsi_deps += [
-    dep_xcb,
-    dep_x11_xcb,
-    dep_xcb_dri2,
-    dep_xcb_dri3,
-    dep_xcb_present,
-    dep_xcb_sync,
-    dep_xshmfence,
-  ]
   files_vulkan_wsi += files('wsi_common_x11.c')
 endif
 
 if with_platform_wayland
-  vulkan_wsi_deps += dep_wayland_client
-  vulkan_wsi_args += ['-DVK_USE_PLATFORM_WAYLAND_KHR']
   files_vulkan_wsi += files('wsi_common_wayland.c')
   files_vulkan_wsi += [
     wayland_drm_client_protocol_h,
@@ -49,21 +34,16 @@ if with_platform_wayland
   ]
 endif
 
-if with_platform_drm
-  vulkan_wsi_args += '-DVK_USE_PLATFORM_DISPLAY_KHR'
+if system_has_kms_drm and not with_platform_android
   files_vulkan_wsi += files('wsi_common_display.c')
 endif
 
-if with_xlib_lease
-  vulkan_wsi_deps += [dep_xcb_xrandr, dep_xlib_xrandr]
-  vulkan_wsi_args += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT'
-endif
-
 libvulkan_wsi = static_library(
   'vulkan_wsi',
   files_vulkan_wsi,
-  include_directories : [inc_common, inc_vulkan_util, inc_include],
-  dependencies : [vulkan_wsi_deps, dep_libdrm],
-  c_args : [c_vis_args, vulkan_wsi_args],
+  include_directories : [inc_include, inc_src],
+  dependencies : [vulkan_wsi_deps, dep_libdrm, idep_vulkan_util, idep_xmlconfig],
+  c_args : [vulkan_wsi_args],
+  gnu_symbol_visibility : 'hidden',
   build_by_default : false,
 )