NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

android: cros: Simplify integration

Browse source 
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>
This commit is contained in:
Kieran Bingham 2021-06-24 22:24:51 +01:00
parent 63c4687537
commit 1ad25efa60
2 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/android/cros/meson.build
View file

@ -4,15 +4,10 @@ if get_option('android_platform') != 'cros'
subdir_done() subdir_done()
endif endif
cros_hal_info_sources = files([ android_hal_sources += files([
'camera3_hal.cpp', 'camera3_hal.cpp',
]) ])
cros_hal_info = static_library('cros_hal_info', android_deps += dependency('libcros_camera')
cros_hal_info_sources,
dependencies : dependency('libcros_camera'),
c_args : '-Wno-shadow',
include_directories : [android_includes,
libcamera_includes])
android_objects += cros_hal_info.extract_objects('camera3_hal.cpp') android_cpp_args += ['-DOS_CHROMEOS']

13
src/android/meson.build
View file

@ -37,15 +37,6 @@ endif
android_deps += [libyuv_dep] 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([ android_hal_sources = files([
'camera3_hal.cpp', 'camera3_hal.cpp',
'camera_capabilities.cpp', 'camera_capabilities.cpp',
@ -63,6 +54,9 @@ android_hal_sources = files([
'yuv/post_processor_yuv.cpp' 'yuv/post_processor_yuv.cpp'
]) ])
android_cpp_args = []
subdir('cros')
subdir('mm') subdir('mm')
android_camera_metadata_sources = files([ android_camera_metadata_sources = files([
@ -80,6 +74,5 @@ libcamera_hal = shared_library('libcamera-hal',
link_with : android_camera_metadata, link_with : android_camera_metadata,
install : true, install : true,
cpp_args : android_cpp_args, cpp_args : android_cpp_args,
objects : android_objects,
include_directories : android_includes, include_directories : android_includes,
dependencies : android_deps) dependencies : android_deps)