From 0e286d0dbcce3e3a49fa4ae54a237afd08954a78 Mon Sep 17 00:00:00 2001 From: Helen Koike Date: Sat, 3 Dec 2022 09:42:19 -0300 Subject: [PATCH] android: allow system = 'android' on cross file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allow building with system = 'android' on the cross file. This avoids creating symlinks for the libs. Suggested-by: Roman Stratiienko Suggested-by: David Heidelberg Signed-off-by: Helen Koike Reviewed-by: Sergi Blanch Torné Part-of: --- .gitlab-ci/container/create-android-cross-file.sh | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/create-android-cross-file.sh b/.gitlab-ci/container/create-android-cross-file.sh index 69050ac6031..303b6ae53c6 100644 --- a/.gitlab-ci/container/create-android-cross-file.sh +++ b/.gitlab-ci/container/create-android-cross-file.sh @@ -24,7 +24,7 @@ strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/$arch-strip' pkgconfig = ['/usr/bin/pkg-config'] [host_machine] -system = 'linux' +system = 'android' cpu_family = '$cpu_family' cpu = '$cpu' endian = 'little' diff --git a/meson.build b/meson.build index 17669575dc2..e1bedff9be6 100644 --- a/meson.build +++ b/meson.build @@ -400,7 +400,7 @@ endif with_egl = get_option('egl') \ .require(host_machine.system() != 'darwin', error_message : 'EGL not supported on MacOS') \ - .require(with_platform_windows or with_platform_haiku or with_dri, error_message : 'EGL requires DRI, Haiku, or Windows') \ + .require(with_platform_windows or with_platform_haiku or with_dri or with_platform_android, error_message : 'EGL requires DRI, Haiku, Windows or Android') \ .require(with_shared_glapi, error_message : 'EGL requires shared-glapi') \ .require(with_glx != 'xlib', error_message :'EGL requires DRI, but GLX is being built with xlib support') \ .disable_auto_if(with_platform_haiku) \