Mesa (master): meson: Define ANDROID and ANDROID_API_LEVEL when compiling for Android

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Aug 5 18:25:46 UTC 2020


Module: Mesa
Branch: master
Commit: 5096ebf9549513436ffd7df7ef7ee1c3ee8cbf7e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5096ebf9549513436ffd7df7ef7ee1c3ee8cbf7e

Author: Kristian H. Kristensen <hoegsberg at google.com>
Date:   Wed Jul 29 01:09:23 2020 -0700

meson: Define ANDROID and ANDROID_API_LEVEL when compiling for Android

Set ANDROID_API_LEVEL based on the value we already have and define
ANDROID to make sure we build code paths that are guarded by that.

Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6112>

---

 meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index a019e4d8d41..39c49775c44 100644
--- a/meson.build
+++ b/meson.build
@@ -854,7 +854,11 @@ if with_platform_android
       dep_android += dependency('nativewindow')
     endif
   endif
-  pre_args += '-DHAVE_ANDROID_PLATFORM'
+  pre_args += [
+    '-DHAVE_ANDROID_PLATFORM',
+    '-DANDROID',
+    '-DANDROID_API_LEVEL=' + get_option('platform-sdk-version').to_string()
+  ]
 endif
 if with_platform_haiku
   pre_args += '-DHAVE_HAIKU_PLATFORM'



More information about the mesa-commit mailing list