libcamera: properly define includes/dependencies

Change-Id: I5f8f4e743a8c48bc044538996fa8248fb117485b
LineageOS · Jun 20, 2018 · a87244b · a87244b
1 parent 3dabe92
commit a87244b
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 21 deletions.
diff --git a/libcamera/common/Activities/ExynosCameraActivityAutofocus.h b/libcamera/common/Activities/ExynosCameraActivityAutofocus.h
@@ -41,8 +41,8 @@
 #include <sys/types.h>
 #include <utils/threads.h>
 
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 #include <linux/vt.h>
 
 #include <utils/RefBase.h>

diff --git a/libcamera/common/Activities/ExynosCameraActivityBase.h b/libcamera/common/Activities/ExynosCameraActivityBase.h
@@ -41,8 +41,8 @@
 #include <sys/types.h>
 #include <utils/threads.h>
 
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 #include <linux/vt.h>
 
 #include <utils/RefBase.h>

diff --git a/libcamera/common/Activities/ExynosCameraActivityFlash.h b/libcamera/common/Activities/ExynosCameraActivityFlash.h
@@ -41,8 +41,8 @@
 #include <sys/types.h>
 #include <utils/threads.h>
 
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 #include <linux/vt.h>
 
 #include <utils/RefBase.h>

diff --git a/libcamera/common/Activities/ExynosCameraActivitySpecialCapture.h b/libcamera/common/Activities/ExynosCameraActivitySpecialCapture.h
@@ -41,8 +41,8 @@
 #include <sys/types.h>
 #include <utils/threads.h>
 
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 #include <linux/vt.h>
 
 #include <utils/RefBase.h>

diff --git a/libcamera/common/Activities/ExynosCameraActivityUCTL.h b/libcamera/common/Activities/ExynosCameraActivityUCTL.h
@@ -41,8 +41,8 @@
 #include <sys/types.h>
 #include <utils/threads.h>
 
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 #include <linux/vt.h>
 
 #include <utils/RefBase.h>

diff --git a/libcamera/common/Buffers/ExynosCameraBuffer.h b/libcamera/common/Buffers/ExynosCameraBuffer.h
@@ -32,8 +32,8 @@
 
 #include <binder/MemoryHeapBase.h>
 #include <hardware/camera.h>
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 
 #include "gralloc_priv.h"
 #include "ion.h"

diff --git a/libcamera/common/Buffers/ExynosCameraBufferLocker.h b/libcamera/common/Buffers/ExynosCameraBufferLocker.h
@@ -32,8 +32,8 @@
 #include <utils/threads.h>
 
 #include <hardware/camera.h>
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 
 #include "fimc-is-metadata.h"
 #include "ExynosCameraConfig.h"

diff --git a/libcamera/common/Buffers/ExynosCameraBufferManager.h b/libcamera/common/Buffers/ExynosCameraBufferManager.h
@@ -35,8 +35,8 @@
 
 #include <binder/MemoryHeapBase.h>
 #include <hardware/camera.h>
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 
 #include "gralloc_priv.h"
 #include "ion.h"

diff --git a/libcamera/common/ExynosCameraMemory.h b/libcamera/common/ExynosCameraMemory.h
@@ -31,8 +31,8 @@
 
 #include <binder/MemoryHeapBase.h>
 #include <hardware/camera.h>
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 
 #include "gralloc_priv.h"
 #include "ion.h"

diff --git a/libcamera/common/ExynosCameraNode.h b/libcamera/common/ExynosCameraNode.h
@@ -41,8 +41,8 @@
 #include <sys/types.h>
 #include <utils/threads.h>
 
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 #include <linux/vt.h>
 
 #include <utils/RefBase.h>

diff --git a/libcamera/common/ExynosCameraUtils.h b/libcamera/common/ExynosCameraUtils.h
@@ -26,10 +26,11 @@
 #include "ExynosRect.h"
 #include "fimc-is-metadata.h"
 #include "ExynosCameraSensorInfo.h"
-#include "videodev2_exynos_media.h"
 #include "ExynosCameraBuffer.h"
 #include "ExynosCameraConfig.h"
 
+#include <linux/videodev2_exynos_media.h>
+
 #define ROUND_OFF(x, dig)           (floor((x) * pow(10.0f, dig)) / pow(10.0f, dig))
 
 namespace android {