From 1ad25efa60c131a0386f251431c2f11d41f4e009 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Thu, 24 Jun 2021 22:24:51 +0100 Subject: android: cros: Simplify integration The ChromeOS specific Android HAL support was overly-complex to support linking an additional library, and then passing the built object into the libcamera.so build. Now that it has its own distinct libcamera-hal.so, simplify the CrOS integration to build directly into that library. The removal of the -Wno-shadow here is intentional, as it is not required for compilation of the camera3_hal.o object. Reviewed-by: Hirokazu Honda Reviewed-by: Paul Elder Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- src/android/cros/meson.build | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/android/cros') diff --git a/src/android/cros/meson.build b/src/android/cros/meson.build index c2bda708..35995dd8 100644 --- a/src/android/cros/meson.build +++ b/src/android/cros/meson.build @@ -4,15 +4,10 @@ if get_option('android_platform') != 'cros' subdir_done() endif -cros_hal_info_sources = files([ +android_hal_sources += files([ 'camera3_hal.cpp', ]) -cros_hal_info = static_library('cros_hal_info', - cros_hal_info_sources, - dependencies : dependency('libcros_camera'), - c_args : '-Wno-shadow', - include_directories : [android_includes, - libcamera_includes]) +android_deps += dependency('libcros_camera') -android_objects += cros_hal_info.extract_objects('camera3_hal.cpp') +android_cpp_args += ['-DOS_CHROMEOS'] -- cgit v1.2.1