Mesa (staging/19.1): anv: Fix vulkan build in meson.

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: 867223cee10529bede9b654c98152e475c36390f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=867223cee10529bede9b654c98152e475c36390f

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Wed Jun 19 15:05:40 2019 +0200

anv: Fix vulkan build in meson.

Apparently the android part was never ported to meson.

CC: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
(cherry picked from commit 755c633b8d9c15227ad07bbc98f06627d4ecf55d)

---

 src/intel/vulkan/meson.build | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index 03dbd98b5a4..7fe660983d9 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -112,7 +112,6 @@ endforeach
 
 libanv_files = files(
   'anv_allocator.c',
-  'anv_android_stubs.c',
   'anv_android.h',
   'anv_batch_chain.c',
   'anv_blorp.c',
@@ -178,6 +177,13 @@ if with_xlib_lease
   anv_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT'
 endif
 
+if with_platform_android
+  anv_flags += '-DVK_USE_PLATFORM_ANDROID_KHR'
+  libanv_files += files('anv_android.c')
+else
+  libanv_files += files('anv_android_stubs.c')
+endif
+
 libanv_common = static_library(
   'anv_common',
   [