From 016e932cdae168d8db5a603ce17182f00dcee79a Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Tue, 20 Apr 2021 18:37:21 +0300 Subject: [PATCH] meson: egl: Do not build platform_drm for Android 'platform_android' wasn't designed to coexist with 'platform_drm' within single build, therefore a lot of conflicts appears during compile-time. Signed-off-by: Roman Stratiienko Reviewed-by: Eric Engestrom Acked-by: Alyssa Rosenzweig Tested-by: Mauro Rossi Part-of: --- meson.build | 4 ++-- src/egl/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 33db495afcc..6b041dac8f8 100644 --- a/meson.build +++ b/meson.build @@ -883,7 +883,7 @@ else pre_args += '-DEGL_NO_X11' gl_pkgconfig_c_flags += '-DEGL_NO_X11' endif -if with_gbm +if with_gbm and not with_platform_android pre_args += '-DHAVE_DRM_PLATFORM' endif @@ -2135,7 +2135,7 @@ endif lines += 'GBM: ' + (with_gbm ? 'yes' : 'no') if with_egl or with_any_vk _platforms += 'surfaceless' - if with_gbm + if with_gbm and not with_platform_android _platforms += 'drm' endif lines += 'EGL/Vulkan/VL platforms: ' + ' '.join(_platforms) diff --git a/src/egl/meson.build b/src/egl/meson.build index 599a66706b7..055cfcf75fb 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -105,7 +105,7 @@ if with_dri2 endif deps_for_egl += [dep_x11_xcb, dep_xcb_dri2, dep_xcb_xfixes] endif - if with_gbm + if with_gbm and not with_platform_android files_egl += files('drivers/dri2/platform_drm.c') link_for_egl += libgbm incs_for_egl += [inc_gbm, include_directories('../gbm/main')]