commit f95637f01a7bc9054638fff0c9225cab0e13b98a
author Eric Engestrom <eric@engestrom.ch> Sat Jul 11 10:17:30 2020 +0200
committer Marge Bot <eric+marge@anholt.net> Tue Jul 14 09:34:54 2020 +0000
tree afbaa969c1f76f1ab786d6a09ab74109b03cc8c2
parent 3ed104b2aa14818f789cbe79de8c6742cc7b5ad7

meson: fix android vulkan build

Android doesn't have `pthread_cancel()` and is unlikely to ever
implement it [1], but `wsi_common_display.c` needs it (or an
alternative).

Let's just disable the platform on Android (as it used to be
before 448eb19158f483d807ef).

[1] https://android-review.googlesource.com/c/platform/bionic/+/1215779/1/docs/status.md

Fixes: 448eb19158f483d807ef ("vulkan: automatically compile the `display` platform when available")
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Acked-by: Nataraj Deshpande <nataraj.deshpande@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5860>

src/amd/vulkan/meson.build

diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index aa27b82..e5fba9d 100644
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -131,7 +131,7 @@
   libradv_files += files('radv_wsi_wayland.c')
 endif
 
-if system_has_kms_drm
+if system_has_kms_drm and not with_platform_android
   radv_flags += '-DVK_USE_PLATFORM_DISPLAY_KHR'
   libradv_files += files('radv_wsi_display.c')
 endif

src/freedreno/vulkan/meson.build

diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build
index eab543e..8696f24 100644
--- a/src/freedreno/vulkan/meson.build
+++ b/src/freedreno/vulkan/meson.build
@@ -81,7 +81,7 @@
   libtu_files += files('tu_wsi_wayland.c')
 endif
 
-if system_has_kms_drm
+if system_has_kms_drm and not with_platform_android
   tu_flags += '-DVK_USE_PLATFORM_DISPLAY_KHR'
   libtu_files += files('tu_wsi_display.c')
 endif

src/intel/vulkan/meson.build

diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index aff4955..2d37fa0 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -155,7 +155,7 @@
   libanv_files += files('anv_wsi_wayland.c')
 endif
 
-if system_has_kms_drm
+if system_has_kms_drm and not with_platform_android
   anv_flags += '-DVK_USE_PLATFORM_DISPLAY_KHR'
   libanv_files += files('anv_wsi_display.c')
 endif

src/vulkan/meson.build

diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build
index 1e3f65c..ae84e0d 100644
--- a/src/vulkan/meson.build
+++ b/src/vulkan/meson.build
@@ -45,7 +45,7 @@
   vulkan_wsi_deps += dep_wayland_client
   vulkan_wsi_list += ['wayland']
 endif
-if system_has_kms_drm
+if system_has_kms_drm and not with_platform_android
   vulkan_wsi_args += '-DVK_USE_PLATFORM_DISPLAY_KHR'
   vulkan_wsi_deps += [dep_libdrm]
   vulkan_wsi_list += ['drm']

src/vulkan/wsi/meson.build

diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build
index 0186ca6..687f589 100644
--- a/src/vulkan/wsi/meson.build
+++ b/src/vulkan/wsi/meson.build
@@ -34,7 +34,7 @@
   ]
 endif
 
-if system_has_kms_drm
+if system_has_kms_drm and not with_platform_android
   files_vulkan_wsi += files('wsi_common_display.c')
 endif