summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-03-23 21:56:20 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-03-25 19:34:54 +0200
commitc2943a6e32d85d3d4b43d29ccb7daf9daaf2ecbe (patch)
treea61edf89ea39753d3592576d1df9e7cf947b34e6 /src
parent82b8151aa775bdf90bbe2f3073fd484e83ea3d51 (diff)
android: meson: Remove unneeded android_enabled check
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@ideasonboard.com> Reviewed-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src')
-rw-r--r--src/android/meson.build36
1 files changed, 17 insertions, 19 deletions
diff --git a/src/android/meson.build b/src/android/meson.build
index 87d162c3..8e7d07d9 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([