diff options
| author | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-06-24 22:24:51 +0100 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-06-25 16:09:46 +0100 |
| commit | 1ad25efa60c131a0386f251431c2f11d41f4e009 (patch) | |
| tree | 1b515215bee7f5d891b7688d09666a50b713028c /src/android | |
| parent | 63c46875376031141e6e9bda694dcb5d59fb8d4b (diff) | |
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 <hiroh@chromium.org>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/cros/meson.build | 11 | ||||
| -rw-r--r-- | src/android/meson.build | 13 |
2 files changed, 6 insertions, 18 deletions
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'] diff --git a/src/android/meson.build b/src/android/meson.build index feda3e09..bd58ef96 100644 --- a/src/android/meson.build +++ b/src/android/meson.build @@ -37,15 +37,6 @@ endif android_deps += [libyuv_dep] -android_cpp_args = [] -android_objects = [] - -if get_option('android_platform') == 'cros' - android_cpp_args += ['-DOS_CHROMEOS'] -endif - -subdir('cros') - android_hal_sources = files([ 'camera3_hal.cpp', 'camera_capabilities.cpp', @@ -63,6 +54,9 @@ android_hal_sources = files([ 'yuv/post_processor_yuv.cpp' ]) +android_cpp_args = [] + +subdir('cros') subdir('mm') android_camera_metadata_sources = files([ @@ -80,6 +74,5 @@ libcamera_hal = shared_library('libcamera-hal', link_with : android_camera_metadata, install : true, cpp_args : android_cpp_args, - objects : android_objects, include_directories : android_includes, dependencies : android_deps) |