From 85f01678a04663e4015ff870cd4d738de302c616 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Tue, 10 Nov 2020 16:03:39 +0000 Subject: src: meson: Re-order subdir layout Move the android subdir below the configuration options to keep all subdirs together. Add a comment explaining why android must come first, and some padding to group the libcamera and ipa components, applications, and remaining adaptation layers. Signed-off-by: Kieran Bingham Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- src/meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/meson.build b/src/meson.build index b9c7e759..8e219943 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,7 +1,5 @@ # SPDX-License-Identifier: CC0-1.0 -subdir('android') - openssl = find_program('openssl', required : true) if openssl.found() ipa_priv_key = custom_target('ipa-priv-key', @@ -13,8 +11,13 @@ else ipa_sign_module = false endif +# The 'android' subdir must be processed first, and the build targets +# are included directly into the libcamera library when this is enabled. +subdir('android') + subdir('libcamera') subdir('ipa') + subdir('cam') subdir('qcam') -- cgit v1.2.1