Cc: Rob Herring <r...@kernel.org> Cc: Tomasz Figa <tf...@chromium.org> Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> --- Completely untested! It's a step in the right direction though; doesn't hurt non-android, and gets android closer to building on meson :) --- meson.build | 13 +++++++++++-- src/egl/meson.build | 5 ++++- 2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build index 875f9d4d294d1911f239..761c33f4651ab37ab7b6 100644 --- a/meson.build +++ b/meson.build @@ -152,7 +152,7 @@ endif # TODO: other OSes with_dri_platform = 'drm' -# TODO: android platform +with_platform_android = false with_platform_wayland = false with_platform_x11 = false with_platform_drm = false @@ -161,6 +161,7 @@ egl_native_platform = '' _platforms = get_option('platforms') if _platforms != '' _split = _platforms.split(',') + with_platform_android = _split.contains('android') with_platform_x11 = _split.contains('x11') with_platform_wayland = _split.contains('wayland') with_platform_drm = _split.contains('drm') @@ -252,7 +253,7 @@ if _vulkan_drivers != '' with_intel_vk = _split.contains('intel') with_amd_vk = _split.contains('amd') with_any_vk = with_amd_vk or with_intel_vk - if not (with_platform_x11 or with_platform_wayland) + if not (with_platform_x11 or with_platform_wayland or with_platform_android) error('Vulkan requires at least one platform (x11, wayland)') endif endif @@ -330,6 +331,14 @@ endif if with_platform_surfaceless pre_args += '-DHAVE_SURFACELESS_PLATFORM' endif +if with_platform_android + dep_android = [ + dependency('cutils'), + dependency('hardware'), + dependency('sync'), + ] + pre_args += '-DHAVE_ANDROID_PLATFORM' +endif prog_python2 = find_program('python2') has_mako = run_command(prog_python2, '-c', 'import mako') diff --git a/src/egl/meson.build b/src/egl/meson.build index ea7ae06761f75c00a40c..cc51671f9d8f24708405 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -129,7 +129,10 @@ if with_platform_wayland 'wayland/wayland-egl', 'wayland/wayland-drm', ) endif -# TODO: android +if with_platform_android + deps_for_egl += dep_android + files_egl += files('drivers/dri2/platform_android.c') +endif # TODO: glvnd -- Cheers, Eric _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev