From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Wed, 19 Jun 2019 13:05:40 +0000 (+0200)
Subject: anv: Fix vulkan build in meson.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=755c633b8d9c15227ad07bbc98f06627d4ecf55d;p=mesa.git

anv: Fix vulkan build in meson.

Apparently the android part was never ported to meson.

CC: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
---

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',
   [