From 6410d1d37c1ea9d1d168840a7ba063facb0bc9d6 Mon Sep 17 00:00:00 2001
From: Kieran Bingham <kieran.bingham@ideasonboard.com>
Date: Fri, 25 Jun 2021 00:09:15 +0100
Subject: libcamera/base: Move class helpers to the base library

Move the class support infrastructure to the base library.

Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/android/camera_buffer.h       | 3 ++-
 src/android/camera_capabilities.h | 3 ++-
 src/android/camera_hal_config.h   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/android')

diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h
index c88124b2..e850c4e3 100644
--- a/src/android/camera_buffer.h
+++ b/src/android/camera_buffer.h
@@ -9,7 +9,8 @@
 
 #include <hardware/camera3.h>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
 #include <libcamera/span.h>
 
 class CameraBuffer final : public libcamera::Extensible
diff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h
index f511607b..4f5be825 100644
--- a/src/android/camera_capabilities.h
+++ b/src/android/camera_capabilities.h
@@ -11,8 +11,9 @@
 #include <memory>
 #include <vector>
 
+#include <libcamera/base/class.h>
+
 #include <libcamera/camera.h>
-#include <libcamera/class.h>
 #include <libcamera/formats.h>
 #include <libcamera/geometry.h>
 
diff --git a/src/android/camera_hal_config.h b/src/android/camera_hal_config.h
index 97dc69c1..a79d5d6c 100644
--- a/src/android/camera_hal_config.h
+++ b/src/android/camera_hal_config.h
@@ -10,7 +10,7 @@
 #include <map>
 #include <string>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
 
 struct CameraConfigData {
 	int facing = -1;
-- 
cgit v1.2.1