From d5ce2679c67877295ce0096afd3d24d28ad34d16 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 src/meson.build | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/meson.build')

diff --git a/src/meson.build b/src/meson.build
index d69b4c1e..0c5b64d6 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
-if get_option('android')
-    subdir('android')
-endif
+subdir('android')
 
 openssl = find_program('openssl', required : true)
 if openssl.found()
-- 
cgit v1.2.1