i965: perf: sklgt2: update memory write config

[mesa.git] / meson.build

diff --git a/meson.build b/meson.build
index 7a536982da69f4c60fb58f2f19158b2edabbfd65..715c966c679ff4637ae5086aca0dbc27ae05ecd8 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -375,6 +375,9 @@ if with_glvnd
   elif with_glx == 'disabled' and not with_egl
     error('glvnd requires DRI based GLX and/or EGL')
   endif
+  if get_option('egl-lib-suffix') != ''
+    error('''EGL lib suffix can't be used with libglvnd''')
+  endif
 endif
 
 if with_vulkan_icd_dir == ''
@@ -723,6 +726,9 @@ if with_platform_android
     dependency('hardware'),
     dependency('sync'),
   ]
+  if get_option('platform-sdk-version') >= 26
+    dep_android += dependency('nativewindow')
+  endif
   pre_args += '-DHAVE_ANDROID_PLATFORM'
 endif
 if with_platform_haiku