Mesa (main): meson: Intel drivers don't require expat on Android

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Aug 12 00:22:57 UTC 2021


Module: Mesa
Branch: main
Commit: dd88fb33fe3224ed8903b1dc8026991baaa4a864
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd88fb33fe3224ed8903b1dc8026991baaa4a864

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Tue Aug 10 12:43:00 2021 -0500

meson: Intel drivers don't require expat on Android

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12308>

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 96a660d849a..93646c9c31a 100644
--- a/meson.build
+++ b/meson.build
@@ -1487,7 +1487,7 @@ if host_machine.system() == 'darwin'
   dep_expat = meson.get_compiler('c').find_library('expat')
 elif host_machine.system() != 'windows'
   dep_expat = dependency('expat', fallback : ['expat', 'expat_dep'],
-                         required: not with_platform_android or with_any_intel)
+                         required: not with_platform_android)
 else
   dep_expat = null_dep
 endif



More information about the mesa-commit mailing list