[libcamera-devel,1/4] src: meson: Re-order subdir layout
diff mbox series

Message ID 20201207150737.307692-2-kieran.bingham@ideasonboard.com
State Accepted
Delegated to: Kieran Bingham
Headers show
Series
  • libcamera: Small meson-fixes
Related show

Commit Message

Kieran Bingham Dec. 7, 2020, 3:07 p.m. UTC 
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 <kieran.bingham@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/meson.build | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Patch
diff mbox series 

diff --git a/src/meson.build b/src/meson.build
index b9c7e7599d61..8e219943acb8 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')