summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>2019-06-19 15:05:40 +0200
committerDylan Baker <dylan@pnwbakers.com>2019-06-20 10:43:26 -0700
commit6f0e3e8a41ed8c70119b6cbe0a9243736f92ae2a (patch)
tree4c942a824c0f8b2cb8b7491e8e98cf1a286f43eb
parent25c3188704831849bf28e877e42a4d0d2ad8ac65 (diff)
downloadmesa-6f0e3e8a41ed8c70119b6cbe0a9243736f92ae2a.tar.gz
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> (cherry picked from commit 755c633b8d9c15227ad07bbc98f06627d4ecf55d)
-rw-r--r--src/intel/vulkan/meson.build8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index 9adf6d95877..83313e15c01 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',
[