summaryrefslogtreecommitdiff
path: root/src/android/cros
diff options
context:
space:
mode:
Diffstat (limited to 'src/android/cros')
-rw-r--r--src/android/cros/camera3_hal.cpp3
-rw-r--r--src/android/cros/meson.build3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/android/cros/camera3_hal.cpp b/src/android/cros/camera3_hal.cpp
index 31ad36ac..d6fc1d0f 100644
--- a/src/android/cros/camera3_hal.cpp
+++ b/src/android/cros/camera3_hal.cpp
@@ -7,12 +7,15 @@
#include <cros-camera/cros_camera_hal.h>
+#include "../camera_hal_manager.h"
+
static void set_up(cros::CameraMojoChannelManagerToken *token)
{
}
static void tear_down()
{
+ delete CameraHalManager::instance();
}
cros::cros_camera_hal_t CROS_CAMERA_EXPORT CROS_CAMERA_HAL_INFO_SYM = {
diff --git a/src/android/cros/meson.build b/src/android/cros/meson.build
index 4aab0f20..13ec8f0a 100644
--- a/src/android/cros/meson.build
+++ b/src/android/cros/meson.build
@@ -12,6 +12,7 @@ cros_hal_info = static_library('cros_hal_info',
cros_hal_info_sources,
dependencies : dependency('libcros_camera'),
c_args : '-Wno-shadow',
- include_directories : android_includes)
+ include_directories : [android_includes,
+ libcamera_includes])
libcamera_objects += cros_hal_info.extract_objects('camera3_hal.cpp')
n88' href='#n88'>88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121