cros: Support the new cros camera API with set_up and tear_down

Implement and expose the symbol and functions that the new cros camera
API requires. Since we don't actually need them, leave them empty.
Update meson accordingly.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Paul Elder 2021-02-25 19:38:26 +09:00
parent d8d6a78f22
commit 09b0801fdb
5 changed files with 43 additions and 0 deletions

View file

@ -0,0 +1,21 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Copyright (C) 2021, Google Inc.
*
* camera3_hal.cpp - cros-specific components of Android Camera HALv3 module
*/
#include <cros-camera/cros_camera_hal.h>
static void set_up(cros::CameraMojoChannelManagerToken *token)
{
}
static void tear_down()
{
}
cros::cros_camera_hal_t CROS_CAMERA_EXPORT CROS_CAMERA_HAL_INFO_SYM = {
.set_up = set_up,
.tear_down = tear_down
};

View file

@ -0,0 +1,17 @@
# SPDX-License-Identifier: CC0-1.0
if get_option('android_platform') != 'cros'
subdir_done()
endif
cros_hal_info_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_objects += cros_hal_info.extract_objects('camera3_hal.cpp')

View file

@ -37,6 +37,8 @@ if android_enabled
android_deps += [libyuv_dep]
endif
subdir('cros')
android_hal_sources = files([
'camera3_hal.cpp',
'camera_hal_manager.cpp',

View file

@ -149,6 +149,7 @@ libcamera = shared_library('camera',
install : true,
link_with : libcamera_link_with,
include_directories : includes,
objects : libcamera_objects,
build_rpath : '/',
dependencies : libcamera_deps)

View file

@ -11,6 +11,8 @@ else
ipa_sign_module = false
endif
libcamera_objects = []
# The 'android' subdir must be processed first, and the build targets
# are included directly into the libcamera library when this is enabled.
subdir('android')