[libcamera-devel] [PATCH] android: meson: Remove unneeded android_enabled check

[Laurent Pinchart]

We return early with subdir_done() if android_enabled is false. There's
no need to check the variable later in the file.

Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
 src/android/meson.build | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/android/meson.build b/src/android/meson.build
index 87d162c3bbea..8e7d07d9be3c 100644
--- a/src/android/meson.build
+++ b/src/android/meson.build
@@ -14,29 +14,27 @@ foreach dep : android_deps
     endif
 endforeach
 
-if android_enabled
-    libyuv_dep = dependency('libyuv', required : false)
+libyuv_dep = dependency('libyuv', required : false)
 
-    # Fallback to a subproject if libyuv isn't found, as it's typically not
-    # provided by distributions.
-    if not libyuv_dep.found()
-        cmake = import('cmake')
+# Fallback to a subproject if libyuv isn't found, as it's typically not
+# provided by distributions.
+if not libyuv_dep.found()
+    cmake = import('cmake')
 
-        libyuv_vars = cmake.subproject_options()
-        libyuv_vars.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'})
-        libyuv_vars.set_override_option('cpp_std', 'c++17')
-        libyuv_vars.append_compile_args('cpp',
-             '-Wno-sign-compare',
-             '-Wno-unused-variable',
-             '-Wno-unused-parameter')
-        libyuv_vars.append_link_args('-ljpeg')
-        libyuv = cmake.subproject('libyuv', options : libyuv_vars)
-        libyuv_dep = libyuv.dependency('yuv')
-    endif
-
-    android_deps += [libyuv_dep]
+    libyuv_vars = cmake.subproject_options()
+    libyuv_vars.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'})
+    libyuv_vars.set_override_option('cpp_std', 'c++17')
+    libyuv_vars.append_compile_args('cpp',
+         '-Wno-sign-compare',
+         '-Wno-unused-variable',
+         '-Wno-unused-parameter')
+    libyuv_vars.append_link_args('-ljpeg')
+    libyuv = cmake.subproject('libyuv', options : libyuv_vars)
+    libyuv_dep = libyuv.dependency('yuv')
 endif
 
+android_deps += [libyuv_dep]
+
 subdir('cros')
 
 android_hal_sources = files([
-- 
Regards,

Laurent Pinchart