exynos: Add kernel headers to include path

diff --git a/include/exynos_v4l2.h b/include/exynos_v4l2.h
index 0b550ef9629c1b6bc801a9be8b09861f7dea9ed3..ed263970243ef81f065e4c4b203efd127975fedf 100644 (file)
--- a/include/exynos_v4l2.h
+++ b/include/exynos_v4l2.h
@@ -41,8 +41,8 @@ extern "C" {
 
 /* V4L2 */
 #include <stdbool.h>
-#include "videodev2.h" /* vendor specific videodev2.h */
-#include "videodev2_exynos_media.h"
+#include <linux/videodev2.h> /* vendor specific videodev2.h */
+#include <linux/videodev2_exynos_media.h>
 
 /*! \ingroup exynos_v4l2 */
 int exynos_v4l2_open(const char *filename, int oflag, ...);
@@ -96,7 +96,7 @@ int exynos_v4l2_g_ext_ctrl(int fd, struct v4l2_ext_controls *ctrl);
 int exynos_v4l2_s_ext_ctrl(int fd, struct v4l2_ext_controls *ctrl);
 
 /* V4L2_SUBDEV */
-#include <v4l2-subdev.h>
+#include <linux/v4l2-subdev.h>
 
 /*! \ingroup exynos_v4l2 */
 int exynos_subdev_open(const char *filename, int oflag, ...);
@@ -126,7 +126,7 @@ int exynos_subdev_s_frame_interval(int fd, struct v4l2_subdev_frame_interval *fr
 int exynos_subdev_enum_mbus_code(int fd, struct v4l2_subdev_mbus_code_enum *mbus_code_enum);
 
 /* MEDIA CONTORLLER */
-#include <media.h>
+#include <linux/media.h>
 
 /*! media_link
  * \ingroup exynos_v4l2

diff --git a/include/s5p_fimc_v4l2.h b/include/s5p_fimc_v4l2.h
index d0c5d5fef409986d3784a03dece140a763eb49c1..52b1b6d910b2d29dc87c2dfac02aaf90b78c322d 100644 (file)
--- a/include/s5p_fimc_v4l2.h
+++ b/include/s5p_fimc_v4l2.h
@@ -20,8 +20,8 @@
 #ifndef _S5P_FIMC_H_
 #define _S5P_FIMC_H_
 
-#include "videodev2.h"
-#include "videodev2_exynos_media.h"
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_media.h>
 
 /*
  * G E N E R A L S
@@ -60,14 +60,9 @@
  * V 4 L 2   F I M C   E X T E N S I O N S
  *
 */
-#define V4L2_PIX_FMT_YVYU       v4l2_fourcc('Y', 'V', 'Y', 'U')
-
 /* FOURCC for FIMC specific */
 #define V4L2_PIX_FMT_NV12X      v4l2_fourcc('N', '1', '2', 'X')
 #define V4L2_PIX_FMT_NV21X      v4l2_fourcc('N', '2', '1', 'X')
-#define V4L2_PIX_FMT_VYUY       v4l2_fourcc('V', 'Y', 'U', 'Y')
-#define V4L2_PIX_FMT_NV16       v4l2_fourcc('N', 'V', '1', '6')
-#define V4L2_PIX_FMT_NV61       v4l2_fourcc('N', 'V', '6', '1')
 #define V4L2_PIX_FMT_NV16X      v4l2_fourcc('N', '1', '6', 'X')
 #define V4L2_PIX_FMT_NV61X      v4l2_fourcc('N', '6', '1', 'X')
 

diff --git a/libcsc/Android.mk b/libcsc/Android.mk
index 82d08df19091c2c30b439dcf73fddf942ce0a665..3920b4c25d6aa805d744d2e485da96232d8799da 100644 (file)
--- a/libcsc/Android.mk
+++ b/libcsc/Android.mk
@@ -17,12 +17,16 @@ LOCAL_C_INCLUDES += \
 endif
 
 LOCAL_C_INCLUDES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        system/core/include \
        hardware/samsung_slsi/openmax/include/khronos \
        hardware/samsung_slsi/openmax/include/$(OMX_NAME) \
        hardware/samsung_slsi/$(PLATFORM_DIR)/include \
        $(LOCAL_PATH)/../include
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_CFLAGS := \
        -DUSE_SAMSUNG_COLORFORMAT \
        -DEXYNOS_OMX
@@ -41,11 +45,15 @@ LOCAL_SRC_FILES := \
        csc.c
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        hardware/samsung_slsi/$(PLATFORM_DIR)/include \
        hardware/samsung_slsi/openmax/include/khronos \
        hardware/samsung_slsi/openmax/include/$(OMX_NAME) \
        $(LOCAL_PATH)/../libexynosutils
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
 LOCAL_CFLAGS :=

diff --git a/libexynosutils/Android.mk b/libexynosutils/Android.mk
index 627e823b198b903d9d0a45df73de26eb10691615..c95e74b330b6b773cd92379c9f37034f96b2e9c8 100644 (file)
--- a/libexynosutils/Android.mk
+++ b/libexynosutils/Android.mk
@@ -33,7 +33,9 @@ LOCAL_MODULE := libexynosutils
 ifeq ($(TARGET_BOARD_PLATFORM), exynos5)
 LOCAL_SRC_FILES += exynos5_format_v4l2.c
 LOCAL_C_INCLUDES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(LOCAL_PATH)/../include
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 endif
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/libexynosutils/exynos5_format_v4l2.c b/libexynosutils/exynos5_format_v4l2.c
index 24f60977a22822f7102ee0b46ac928a6e94b1014..8c30826674f0a95897899155e42d297873acfd51 100644 (file)
--- a/libexynosutils/exynos5_format_v4l2.c
+++ b/libexynosutils/exynos5_format_v4l2.c
@@ -41,8 +41,6 @@
 #include "exynos_format.h"
 #include "s5p_fimc_v4l2.h"
 #include <utils/Log.h>
-#include "videodev2.h"
-#include "videodev2_exynos_media.h"
 
 int HAL_PIXEL_FORMAT_2_V4L2_PIX(
     int hal_pixel_format)

diff --git a/libfimg4x/Android.mk b/libfimg4x/Android.mk
index 74fc02b987539e2b1a924375aabc2e8f7fa89e16..5ec306033e22025354538b4a1cf761e589a01fa9 100644 (file)
--- a/libfimg4x/Android.mk
+++ b/libfimg4x/Android.mk
@@ -25,8 +25,12 @@ LOCAL_SRC_FILES:= \
        FimgExynos5.cpp
 
 LOCAL_C_INCLUDES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(LOCAL_PATH)/../include
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_SHARED_LIBRARIES:= liblog libutils libbinder
 
 LOCAL_MODULE:= libfimg

diff --git a/libv4l2/Android.mk b/libv4l2/Android.mk
index f7d06cf419ef2dd998b5d5e8759ed4b8d19ba3c6..e2c44de677e92bcddd4ddbaec14a14a1cbac0673 100644 (file)
--- a/libv4l2/Android.mk
+++ b/libv4l2/Android.mk
@@ -22,9 +22,13 @@ LOCAL_SRC_FILES := \
        exynos_mc.c
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(LOCAL_PATH)/../include \
        $(TOP)/hardware/samsung_slsi/exynos/libexynosutils
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_SHARED_LIBRARIES := \
        liblog \
        libutils \

diff --git a/libv4l2/exynos_mc.c b/libv4l2/exynos_mc.c
index 02e83032d44db6dec882c72c8396e34d79325717..759eb51d2b036e6fe978358ccc1176ae05ea4ac5 100644 (file)
--- a/libv4l2/exynos_mc.c
+++ b/libv4l2/exynos_mc.c
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <media.h>
+#include <linux/media.h>
 #include <linux/kdev_t.h>
 #include <linux/types.h>