Commit b0708610 authored by Gurchetan Singh's avatar Gurchetan Singh 💬

configure.ac / meson: depend on libnativewindow when appropriate

libnativewindow is only available on O or greater, and it's
required for some features.
Reviewed-by: Tapani Pälli's avatarTapani Pälli <tapani.palli@intel.com>
parent bfed0a70
......@@ -1574,6 +1574,12 @@ if test "x$enable_libglvnd" = xyes -a "x$EGL_LIB_SUFFIX" != x; then
AC_MSG_ERROR([EGL lib suffix can't be used with libglvnd])
fi
AC_ARG_WITH([platform-sdk-version],
[AS_HELP_STRING([--with-platform-sdk-version@<:@=NAME@:>@],
[specify Android platform SDK version @<:@default=none@:>@])],
[platform_sdk_version=$withval],
[platform_sdk_version=""])
dnl
dnl Mangled Mesa support
dnl
......@@ -1908,7 +1914,12 @@ for plat in $platforms; do
;;
android)
PKG_CHECK_MODULES([ANDROID], [cutils hardware sync])
if test -n "$platform_sdk_version" && test "$platform_sdk_version" -ge 26; then
PKG_CHECK_MODULES([ANDROID], [cutils hardware nativewindow sync])
else
PKG_CHECK_MODULES([ANDROID], [cutils hardware sync])
fi
if test -n "$with_gallium_drivers"; then
PKG_CHECK_MODULES([BACKTRACE], [backtrace])
fi
......
......@@ -726,6 +726,9 @@ if with_platform_android
dependency('hardware'),
dependency('sync'),
]
if get_option('platform-sdk-version') >= 26
dep_android += dependency('nativewindow')
endif
pre_args += '-DHAVE_ANDROID_PLATFORM'
endif
if with_platform_haiku
......
......@@ -347,3 +347,11 @@ option(
value : '',
description : 'Suffix to append to GLES library names. Default: none.'
)
option(
'platform-sdk-version',
type : 'integer',
min : 25,
max : 28,
value : 25,
description : 'Android Platform SDK version. Default: Nougat version.'
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment