mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-01-22 05:33:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

android: allow system = 'android' on cross file

Browse Source 
Allow building with system = 'android' on the cross file.
This avoids creating symlinks for the libs.

Suggested-by: Roman Stratiienko <r.stratiienko@gmail.com>
Suggested-by: David Heidelberg <david.heidelberg@collabora.com>
Signed-off-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Sergi Blanch Torné <sergi.blanch.torne@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20019>
This commit is contained in:
Helen Koike 2022-12-03 09:42:19 -03:00
parent 87e6703b67
commit 0e286d0dbc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/container/create-android-cross-file.sh
View File

@ -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'

2
meson.build
View File

@ -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) \