From d5ce2679c67877295ce0096afd3d24d28ad34d16 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 16 Sep 2020 16:04:03 +0300 Subject: libcamera: Turn the android option into a feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allow disabling compilation of the Android HAL adaptation layer automatically when a dependency is missing by turning the android option into a feature. The default value is set to 'disabled' to match the current behaviour. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- src/android/meson.build | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'src/android/meson.build') diff --git a/src/android/meson.build b/src/android/meson.build index ecb92f6e..0293c203 100644 --- a/src/android/meson.build +++ b/src/android/meson.build @@ -1,5 +1,19 @@ # SPDX-License-Identifier: CC0-1.0 +android_deps = [ + dependency('libexif', required : get_option('android')), + dependency('libjpeg', required : get_option('android')), +] + +android_enabled = true + +foreach dep : android_deps + if not dep.found() + android_enabled = false + subdir_done() + endif +endforeach + android_hal_sources = files([ 'camera3_hal.cpp', 'camera_hal_manager.cpp', @@ -14,11 +28,6 @@ android_camera_metadata_sources = files([ 'metadata/camera_metadata.c', ]) -android_deps = [ - dependency('libexif'), - dependency('libjpeg'), -] - android_camera_metadata = static_library('camera_metadata', android_camera_metadata_sources, include_directories : android_includes) -- cgit v1.2.1