From patchwork Mon Nov 23 16:43:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 10473 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 71328BE08A for ; Mon, 23 Nov 2020 16:45:02 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C6003631D0; Mon, 23 Nov 2020 17:45:01 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Dj0E4oie"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9DEAD633F1 for ; Mon, 23 Nov 2020 17:44:58 +0100 (CET) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3DE45102C; Mon, 23 Nov 2020 17:44:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1606149898; bh=pvAcf31Nt7MYCaAl85Z3ZX8dBpKXHlfdLGUf4gf/gCU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dj0E4oie0rqpHQfZINp33TCdtV0pneR+g1i+DqzGG+00iS0ng9Ti8cVRWmxYEW/kK 3JR5pjFeE8kKpZgqe1BGZPteraXtHTVdudw0Kh8vN+OMJcmXFvVD3yM8BX3a91/wPp Q7jX2Um1KGCEipvkAdqZ5Q5Erxe9jM5dU5Cb0T5M= From: Kieran Bingham To: libcamera devel Date: Mon, 23 Nov 2020 16:43:13 +0000 Message-Id: <20201123164319.152742-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201123164319.152742-1-kieran.bingham@ideasonboard.com> References: <20201123164319.152742-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 2/8] src: meson: Re-order subdir layout X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/meson.build b/src/meson.build index b9c7e7599d61..27f70544f1f6 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,12 @@ else ipa_sign_module = false endif +# The Android HAL must be built before, and is included in libcamera. +subdir('android') + subdir('libcamera') subdir('ipa') + subdir('cam') subdir('qcam')