exynos: Add kernel headers to include path

Change-Id: If0afb51b7f9c63a3f8ccf96caf83bb9e47eec2a8

diff --git a/include/ExynosJpegApi.h b/include/ExynosJpegApi.h
index b0b9a59d2ba90fccf2779a5a4e0232538c8f959a..eded1bf158f3b8180bcf108f71fc089d6eff92e6 100644 (file)
--- a/include/ExynosJpegApi.h
+++ b/include/ExynosJpegApi.h
@@ -25,7 +25,7 @@
 // This prevents conflict from the Exynos HAL from the original videodev2.h
 /*
 #ifndef v4l2_fourcc
-#include <videodev2.h>
+#include <linux/videodev2.h>
 #endif
 */
 

diff --git a/include/decon-fb.h b/include/decon-fb.h
deleted file mode 100644 (file)
index 66fb784..0000000
--- a/include/decon-fb.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ***   To edit the content of this header, modify the corresponding
- ***   source file (e.g. under external/kernel-headers/original/) then
- ***   run bionic/libc/kernel/tools/update_all.py
- ***
- ***   Any manual change here will be lost the next time this script will
- ***   be run. You've been warned!
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef ___SAMSUNG_DECON_H__
-#define ___SAMSUNG_DECON_H__
-#define S3C_FB_MAX_WIN (7)
-#define MAX_DECON_WIN (7)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define DECON_WIN_UPDATE_IDX MAX_DECON_WIN
-#define MAX_BUF_PLANE_CNT (3)
-typedef unsigned int u32;
-#if defined(USES_ARCH_ARM64) || defined(USES_DECON_64BIT_ADDRESS)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-typedef uint64_t dma_addr_t;
-#else
-typedef uint32_t dma_addr_t;
-#endif
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct decon_win_rect {
-  int x;
-  int y;
-  u32 w;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  u32 h;
-};
-struct decon_rect {
-  int left;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  int top;
-  int right;
-  int bottom;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct s3c_fb_user_window {
-  int x;
-  int y;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct s3c_fb_user_plane_alpha {
-  int channel;
-  unsigned char red;
-  unsigned char green;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  unsigned char blue;
-};
-struct s3c_fb_user_chroma {
-  int enabled;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  unsigned char red;
-  unsigned char green;
-  unsigned char blue;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct s3c_fb_user_ion_client {
-  int fd[MAX_BUF_PLANE_CNT];
-  int offset;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum decon_pixel_format {
-  DECON_PIXEL_FORMAT_ARGB_8888 = 0,
-  DECON_PIXEL_FORMAT_ABGR_8888,
-  DECON_PIXEL_FORMAT_RGBA_8888,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_PIXEL_FORMAT_BGRA_8888,
-  DECON_PIXEL_FORMAT_XRGB_8888,
-  DECON_PIXEL_FORMAT_XBGR_8888,
-  DECON_PIXEL_FORMAT_RGBX_8888,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_PIXEL_FORMAT_BGRX_8888,
-  DECON_PIXEL_FORMAT_RGBA_5551,
-  DECON_PIXEL_FORMAT_RGB_565,
-  DECON_PIXEL_FORMAT_NV16,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_PIXEL_FORMAT_NV61,
-  DECON_PIXEL_FORMAT_YVU422_3P,
-  DECON_PIXEL_FORMAT_NV12,
-  DECON_PIXEL_FORMAT_NV21,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_PIXEL_FORMAT_NV12M,
-  DECON_PIXEL_FORMAT_NV21M,
-  DECON_PIXEL_FORMAT_YUV420,
-  DECON_PIXEL_FORMAT_YVU420,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_PIXEL_FORMAT_YUV420M,
-  DECON_PIXEL_FORMAT_YVU420M,
-  DECON_PIXEL_FORMAT_NV12N,
-  DECON_PIXEL_FORMAT_NV12N_10B,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_PIXEL_FORMAT_MAX,
-};
-enum decon_blending {
-  DECON_BLENDING_NONE = 0,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_BLENDING_PREMULT = 1,
-  DECON_BLENDING_COVERAGE = 2,
-  DECON_BLENDING_MAX = 3,
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum otf_status {
-  S3C_FB_DMA,
-  S3C_FB_LOCAL,
-  S3C_FB_STOP_DMA,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  S3C_FB_READY_TO_LOCAL,
-};
-enum vpp_rotate {
-  VPP_ROT_NORMAL = 0x0,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  VPP_ROT_XFLIP,
-  VPP_ROT_YFLIP,
-  VPP_ROT_180,
-  VPP_ROT_90,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  VPP_ROT_90_XFLIP,
-  VPP_ROT_90_YFLIP,
-  VPP_ROT_270,
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum vpp_csc_eq {
-  BT_601_NARROW = 0x0,
-  BT_601_WIDE,
-  BT_709_NARROW,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  BT_709_WIDE,
-};
-enum decon_idma_type {
-  IDMA_G0 = 0x0,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  IDMA_G1,
-  IDMA_VG0,
-  IDMA_VG1,
-  IDMA_VGR0,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  IDMA_VGR1,
-  IDMA_G2,
-  IDMA_G3,
-  MAX_DECON_DMA_TYPE
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct vpp_params {
-  dma_addr_t addr[MAX_BUF_PLANE_CNT];
-  enum vpp_rotate rot;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  enum vpp_csc_eq eq_mode;
-};
-struct decon_frame {
-  int x;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  int y;
-  u32 w;
-  u32 h;
-  u32 f_w;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  u32 f_h;
-};
-struct decon_win_config {
-  enum {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-    DECON_WIN_STATE_DISABLED = 0,
-    DECON_WIN_STATE_COLOR,
-    DECON_WIN_STATE_BUFFER,
-    DECON_WIN_STATE_UPDATE,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  } state;
-  union {
-    __u32 color;
-    struct {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-      int fd_idma[3];
-      int fence_fd;
-      int plane_alpha;
-      enum decon_blending blending;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-      enum decon_idma_type idma_type;
-      enum decon_pixel_format format;
-      struct vpp_params vpp_parm;
-      struct decon_win_rect block_area;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-      struct decon_win_rect transparent_area;
-      struct decon_win_rect covered_opaque_area;
-      struct decon_frame src;
-    };
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  };
-  struct decon_frame dst;
-  bool protection;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct decon_win_config_data {
-  int fence;
-  int fd_odma;
-  struct decon_win_config config[MAX_DECON_WIN + 1];
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct decon_dual_display_blank_data {
-  enum {
-    DECON_PRIMARY_DISPLAY = 0,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-    DECON_SECONDARY_DISPLAY,
-  } display_type;
-  int blank;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum disp_pwr_mode {
-  DECON_POWER_MODE_OFF = 0,
-  DECON_POWER_MODE_DOZE,
-  DECON_POWER_MODE_NORMAL,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_POWER_MODE_DOZE_SUSPEND,
-};
-#define S3CFB_WIN_POSITION _IOW('F', 203, struct s3c_fb_user_window)
-#define S3CFB_WIN_SET_PLANE_ALPHA _IOW('F', 204, struct s3c_fb_user_plane_alpha)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define S3CFB_WIN_SET_CHROMA _IOW('F', 205, struct s3c_fb_user_chroma)
-#define S3CFB_SET_VSYNC_INT _IOW('F', 206, __u32)
-#define S3CFB_GET_ION_USER_HANDLE _IOWR('F', 208, struct s3c_fb_user_ion_client)
-#define S3CFB_WIN_CONFIG _IOW('F', 209, struct decon_win_config_data)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define S3CFB_DUAL_DISPLAY_BLANK _IOW('F', 300, struct decon_dual_display_blank_data)
-#define S3CFB_WIN_PSR_EXIT _IOW('F', 210, int)
-#define EXYNOS_GET_HDMI_CONFIG _IOW('F', 220, struct exynos_hdmi_data)
-#define EXYNOS_SET_HDMI_CONFIG _IOW('F', 221, struct exynos_hdmi_data)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define S3CFB_POWER_MODE _IOW('F', 223, __u32)
-#endif

diff --git a/include/decon_8890.h b/include/decon_8890.h
deleted file mode 100644 (file)
index a9af576..0000000
--- a/include/decon_8890.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ***   To edit the content of this header, modify the corresponding
- ***   source file (e.g. under external/kernel-headers/original/) then
- ***   run bionic/libc/kernel/tools/update_all.py
- ***
- ***   Any manual change here will be lost the next time this script will
- ***   be run. You've been warned!
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef ___SAMSUNG_DECON_H__
-#define ___SAMSUNG_DECON_H__
-#define S3C_FB_MAX_WIN (8)
-#define MAX_DECON_WIN (8)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define DECON_WIN_UPDATE_IDX MAX_DECON_WIN
-#define MAX_BUF_PLANE_CNT (3)
-typedef unsigned int u32;
-#ifdef USES_ARCH_ARM64
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-typedef uint64_t dma_addr_t;
-#else
-typedef uint32_t dma_addr_t;
-#endif
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct decon_win_rect {
-  int x;
-  int y;
-  u32 w;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  u32 h;
-};
-struct decon_rect {
-  int left;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  int top;
-  int right;
-  int bottom;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct s3c_fb_user_window {
-  int x;
-  int y;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct s3c_fb_user_plane_alpha {
-  int channel;
-  unsigned char red;
-  unsigned char green;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  unsigned char blue;
-};
-struct s3c_fb_user_chroma {
-  int enabled;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  unsigned char red;
-  unsigned char green;
-  unsigned char blue;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct s3c_fb_user_ion_client {
-  int fd[MAX_BUF_PLANE_CNT];
-  int offset;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum decon_pixel_format {
-  DECON_PIXEL_FORMAT_ARGB_8888 = 0,
-  DECON_PIXEL_FORMAT_ABGR_8888,
-  DECON_PIXEL_FORMAT_RGBA_8888,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_PIXEL_FORMAT_BGRA_8888,
-  DECON_PIXEL_FORMAT_XRGB_8888,
-  DECON_PIXEL_FORMAT_XBGR_8888,
-  DECON_PIXEL_FORMAT_RGBX_8888,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_PIXEL_FORMAT_BGRX_8888,
-  DECON_PIXEL_FORMAT_RGBA_5551,
-  DECON_PIXEL_FORMAT_RGB_565,
-  DECON_PIXEL_FORMAT_NV16,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_PIXEL_FORMAT_NV61,
-  DECON_PIXEL_FORMAT_YVU422_3P,
-  DECON_PIXEL_FORMAT_NV12,
-  DECON_PIXEL_FORMAT_NV21,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_PIXEL_FORMAT_NV12M,
-  DECON_PIXEL_FORMAT_NV21M,
-  DECON_PIXEL_FORMAT_YUV420,
-  DECON_PIXEL_FORMAT_YVU420,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_PIXEL_FORMAT_YUV420M,
-  DECON_PIXEL_FORMAT_YVU420M,
-  DECON_PIXEL_FORMAT_NV12N,
-  DECON_PIXEL_FORMAT_NV12N_10B,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_PIXEL_FORMAT_MAX,
-};
-enum decon_blending {
-  DECON_BLENDING_NONE = 0,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_BLENDING_PREMULT = 1,
-  DECON_BLENDING_COVERAGE = 2,
-  DECON_BLENDING_MAX = 3,
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum otf_status {
-  S3C_FB_DMA,
-  S3C_FB_LOCAL,
-  S3C_FB_STOP_DMA,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  S3C_FB_READY_TO_LOCAL,
-};
-enum vpp_rotate {
-  VPP_ROT_NORMAL = 0x0,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  VPP_ROT_XFLIP,
-  VPP_ROT_YFLIP,
-  VPP_ROT_180,
-  VPP_ROT_90,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  VPP_ROT_90_XFLIP,
-  VPP_ROT_90_YFLIP,
-  VPP_ROT_270,
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum vpp_csc_eq {
-  BT_601_NARROW = 0x0,
-  BT_601_WIDE,
-  BT_709_NARROW,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  BT_709_WIDE,
-};
-enum decon_idma_type {
-  IDMA_G0 = 0x0,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  IDMA_G1,
-  IDMA_VG0,
-  IDMA_VG1,
-  IDMA_G2,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  IDMA_G3,
-  IDMA_VGR0,
-  IDMA_VGR1,
-  ODMA_WB,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  MAX_DECON_DMA_TYPE
-};
-struct vpp_params {
-  dma_addr_t addr[MAX_BUF_PLANE_CNT];
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  enum vpp_rotate rot;
-  enum vpp_csc_eq eq_mode;
-};
-struct decon_frame {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  int x;
-  int y;
-  u32 w;
-  u32 h;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  u32 f_w;
-  u32 f_h;
-};
-struct decon_win_config {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  enum {
-    DECON_WIN_STATE_DISABLED = 0,
-    DECON_WIN_STATE_COLOR,
-    DECON_WIN_STATE_BUFFER,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-    DECON_WIN_STATE_UPDATE,
-  } state;
-  union {
-    __u32 color;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-    struct {
-      int fd_idma[3];
-      int fence_fd;
-      int plane_alpha;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-      enum decon_blending blending;
-      enum decon_idma_type idma_type;
-      enum decon_pixel_format format;
-      struct vpp_params vpp_parm;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-      struct decon_win_rect block_area;
-      struct decon_win_rect transparent_area;
-      struct decon_win_rect covered_opaque_area;
-      struct decon_frame src;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-    };
-  };
-  struct decon_frame dst;
-  bool protection;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  bool compression;
-};
-struct decon_win_config_data {
-  int fence;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  int fd_odma;
-  struct decon_win_config config[MAX_DECON_WIN + 1];
-};
-struct decon_dual_display_blank_data {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  enum {
-    DECON_PRIMARY_DISPLAY = 0,
-    DECON_SECONDARY_DISPLAY,
-  } display_type;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  int blank;
-};
-enum disp_pwr_mode {
-  DECON_POWER_MODE_OFF = 0,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  DECON_POWER_MODE_DOZE,
-  DECON_POWER_MODE_NORMAL,
-  DECON_POWER_MODE_DOZE_SUSPEND,
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define S3CFB_WIN_POSITION _IOW('F', 203, struct s3c_fb_user_window)
-#define S3CFB_WIN_SET_PLANE_ALPHA _IOW('F', 204, struct s3c_fb_user_plane_alpha)
-#define S3CFB_WIN_SET_CHROMA _IOW('F', 205, struct s3c_fb_user_chroma)
-#define S3CFB_SET_VSYNC_INT _IOW('F', 206, __u32)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define S3CFB_GET_ION_USER_HANDLE _IOWR('F', 208, struct s3c_fb_user_ion_client)
-#define S3CFB_WIN_CONFIG _IOW('F', 209, struct decon_win_config_data)
-#define S3CFB_WIN_PSR_EXIT _IOW('F', 210, int)
-#define S3CFB_DUAL_DISPLAY_BLANK _IOW('F', 300, struct decon_dual_display_blank_data)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EXYNOS_GET_HDMI_CONFIG _IOW('F', 220, struct exynos_hdmi_data)
-#define EXYNOS_SET_HDMI_CONFIG _IOW('F', 221, struct exynos_hdmi_data)
-#define S3CFB_POWER_MODE _IOW('F', 223, __u32)
-#endif
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

diff --git a/include/exynos_blender.h b/include/exynos_blender.h
index a6ef6d8c690b4c06bb66ce00ac92e032b682c3c1..e4cc276c4a2f14f0fb0c5a757a7d7341dc8babe8 100644 (file)
--- a/include/exynos_blender.h
+++ b/include/exynos_blender.h
@@ -29,7 +29,7 @@
 #ifndef __EXYNOS_BLENDER_H__
 #define __EXYNOS_BLENDER_H__
 
-#include "videodev2.h"
+#include <linux/videodev2.h>
 
 #define BL_MAX_PLANES   3
 

diff --git a/include/exynos_scaler.h b/include/exynos_scaler.h
index ebd8062daaef2ad4f2b355239e7403a17c60119f..d6246c6ece42b436e4370f2a869ec992fcbb7972 100644 (file)
--- a/include/exynos_scaler.h
+++ b/include/exynos_scaler.h
@@ -34,8 +34,8 @@
 #define _EXYNOS_SCALER_H_
 
 
-#include <videodev2.h>
-#include <videodev2_exynos_media.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_media.h>
 #include <stdbool.h>
 
 #include "exynos_format.h"

diff --git a/include/exynos_v4l2.h b/include/exynos_v4l2.h
index 262cc1f9d1ddcaba240fa1cdb151a86c8efb57fd..d383a3da898b391516dd2028d4e5b82d3935ec47 100644 (file)
--- a/include/exynos_v4l2.h
+++ b/include/exynos_v4l2.h
@@ -41,7 +41,7 @@ extern "C" {
 
 /* V4L2 */
 #include <stdbool.h>
-#include "videodev2.h" /* vendor specific videodev2.h */
+#include "linux/videodev2.h" /* vendor specific videodev2.h */
 
 /*! \ingroup exynos_v4l2 */
 int exynos_v4l2_open(const char *filename, int oflag, ...);
@@ -97,7 +97,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, ...);
@@ -127,7 +127,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/include/s5p_tvout_v4l2.h b/include/s5p_tvout_v4l2.h
index d11db09a175bf974063a659643b7b7f677001b54..cada1fecce641171017bf59f3d7ea1e2012c743a 100644 (file)
--- a/include/s5p_tvout_v4l2.h
+++ b/include/s5p_tvout_v4l2.h
@@ -19,8 +19,8 @@
 
 #include <linux/fb.h>
 
-#include "videodev2.h"
-#include "videodev2_exynos_media.h"
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_media.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/libcsc/Android.mk b/libcsc/Android.mk
index 7ab19055c1b62d7077c2fa11659610d41bffd49b..de80e8c0ca79adf04cd501ec43579bdd4473fd2d 100644 (file)
--- a/libcsc/Android.mk
+++ b/libcsc/Android.mk
@@ -8,10 +8,14 @@ LOCAL_SRC_FILES := \
        csc.c
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \
        $(LOCAL_PATH)/../include \
        $(LOCAL_PATH)/../libexynosutils
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
 LOCAL_CFLAGS :=

diff --git a/libdisplay/Android.mk b/libdisplay/Android.mk
index 804f3df004c11b15a28b461dbaecc10b44d57a86..6c3d5f07e71a260a52145085c5f89e8e4347d2ff 100644 (file)
--- a/libdisplay/Android.mk
+++ b/libdisplay/Android.mk
@@ -33,6 +33,7 @@ endif
 LOCAL_CFLAGS += -DLOG_TAG=\"display\"
 LOCAL_CFLAGS += -DHLOG_CODE=1
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \
        $(LOCAL_PATH)/../include \
@@ -43,6 +44,9 @@ LOCAL_C_INCLUDES := \
        $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/libhwcmodule \
        $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/libhwcutilsmodule
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_SRC_FILES := \
        ExynosDisplay.cpp \
        ExynosOverlayDisplay.cpp

diff --git a/libexynosutils/Android.mk b/libexynosutils/Android.mk
index 12bb080d4e312a237e1019e19734d44308bbde24..e421ff1bb88648b3afd4bf8078518991646771a0 100644 (file)
--- a/libexynosutils/Android.mk
+++ b/libexynosutils/Android.mk
@@ -32,7 +32,10 @@ LOCAL_MODULE := libexynosutils
 
 LOCAL_SRC_FILES += exynos_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
+
 include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
 include $(BUILD_SHARED_LIBRARY)

diff --git a/libexynosutils/exynos_format_v4l2.c b/libexynosutils/exynos_format_v4l2.c
index fec1e71e265b91306d9699cba3e2a37e6a4f77a1..9424bc77fb4408965d5e99c78a2e83311ad51f8f 100644 (file)
--- a/libexynosutils/exynos_format_v4l2.c
+++ b/libexynosutils/exynos_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 881f3e1ae7be93551ece04f83c421bd1d56fee01..9acf05d41a798ee60ce141a14d457189749da1e0 100644 (file)
--- a/libfimg4x/Android.mk
+++ b/libfimg4x/Android.mk
@@ -25,10 +25,14 @@ LOCAL_SRC_FILES:= \
        FimgExynos5.cpp
 
 LOCAL_C_INCLUDES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(LOCAL_PATH)/../include \
        hardware/samsung_slsi/$(TARGET_SOC)/include \
        hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_SHARED_LIBRARIES:= liblog libutils libbinder
 
 LOCAL_MODULE:= libfimg

diff --git a/libfimg5x/Android.mk b/libfimg5x/Android.mk
index 058996344bdb92817c025fa7170f491ec03dc02a..2034c1b1664d17c08bd4410582f4686e6a90afbb 100644 (file)
--- a/libfimg5x/Android.mk
+++ b/libfimg5x/Android.mk
@@ -24,13 +24,13 @@ LOCAL_SRC_FILES:= \
        FimgExynos5.cpp
 
 LOCAL_C_INCLUDES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(LOCAL_PATH)/../include \
        hardware/samsung_slsi/$(TARGET_SOC)/include \
        hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include
 
-ifeq ($(filter 3.18, $(TARGET_LINUX_KERNEL_VERSION)), 3.18)
-LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi/exynos/kernel-3.18-headers
-endif
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 LOCAL_SHARED_LIBRARIES:= liblog libutils libbinder
 

diff --git a/libfimg5x/FimgApi.cpp b/libfimg5x/FimgApi.cpp
index 80b524ba44f920cdc36e321737eb3e65eb7726c5..cc7670f34091dd9ebe7dfbcb76e397febe1a3511 100644 (file)
--- a/libfimg5x/FimgApi.cpp
+++ b/libfimg5x/FimgApi.cpp
@@ -24,7 +24,7 @@
 #include "FimgApi.h"
 
 #ifdef FIMG2D_USE_M2M1SHOT2
-#include "videodev2.h"
+#include <linux/videodev2.h>
 #include <linux/m2m1shot2.h>
 
 /* include freq leveling and compromise table */

diff --git a/libg2d/Android.mk b/libg2d/Android.mk
index 53d1cb1edaca3788091ce5826cbefe9c34da54a7..be6cf4cbbbeceded881b549567c57feb2a6c1bcf 100644 (file)
--- a/libg2d/Android.mk
+++ b/libg2d/Android.mk
@@ -19,10 +19,14 @@ LOCAL_PRELINK_MODULE := false
 LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils libexynosv4l2
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(LOCAL_PATH)/../include \
        $(TOP)/hardware/samsung_slsi/exynos/include \
        $(TOP)/hardware/samsung_slsi/exynos/libexynosutils
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_SRC_FILES := exynos_blender.cpp exynos_blender_obj.cpp libg2d.cpp
 
 LOCAL_MODULE_TAGS := eng

diff --git a/libg2d/libg2d.cpp b/libg2d/libg2d.cpp
index 0df0806ef6f8abdf0fa0ca5d22431c3f548b08db..5799536c5c1fbe21b55d974778fc320601a3c20f 100644 (file)
--- a/libg2d/libg2d.cpp
+++ b/libg2d/libg2d.cpp
@@ -33,7 +33,7 @@
 
 #include "exynos_blender.h"
 #include "exynos_blender_obj.h"
-#include "videodev2_exynos_media.h"
+#include <linux/videodev2_exynos_media.h>
 #include "exynos_v4l2.h"
 #include "libg2d_obj.h"
 

diff --git a/libgscaler/Android.mk b/libgscaler/Android.mk
index 13e0cb73490d17864f125fc8506d77d39aba627a..2c2baa749ae5a72af2522b8f9faf361d506a814c 100644 (file)
--- a/libgscaler/Android.mk
+++ b/libgscaler/Android.mk
@@ -23,11 +23,15 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils libexynosv4l2
 # LOCAL_STATIC_LIBRARIES := libsecurepath
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(LOCAL_PATH)/../include \
        $(TOP)/hardware/samsung_slsi/exynos5/include \
        $(TOP)/hardware/samsung_slsi/exynos/libexynosutils \
        $(TOP)/hardware/samsung_slsi/exynos/libmpp
 
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_SRC_FILES := \
        libgscaler_obj.cpp \
        libgscaler.cpp

diff --git a/libgscaler/libgscaler_obj.h b/libgscaler/libgscaler_obj.h
index fa8c8e020dc60cd5f334d6fe847a2cd92992993c..c6e659489047404338bdc8dae8dee190bc447aa5 100644 (file)
--- a/libgscaler/libgscaler_obj.h
+++ b/libgscaler/libgscaler_obj.h
@@ -27,7 +27,7 @@ extern "C" {
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <videodev2.h>
+#include <linux/videodev2.h>
 #include <fcntl.h>
 #include <stdbool.h>
 #include <string.h>
@@ -36,7 +36,7 @@ extern "C" {
 #include <stdlib.h>
 #include <time.h>
 #include <system/graphics.h>
-#include <videodev2_exynos_media.h>
+#include <linux/videodev2_exynos_media.h>
 #include "exynos_gscaler.h"
 
 #include "exynos_format.h"

diff --git a/libhdmi/ExynosExternalDisplay.h b/libhdmi/ExynosExternalDisplay.h
index 1592ec20f08b0c3984ba9a07aa01f404d5eb2535..c7bc149690b300c69c796c878c6a9857fe8e6d8c 100644 (file)
--- a/libhdmi/ExynosExternalDisplay.h
+++ b/libhdmi/ExynosExternalDisplay.h
@@ -3,8 +3,8 @@
 
 #include "ExynosHWC.h"
 #include "ExynosDisplay.h"
-#include "../../exynos/kernel-3.10-headers/videodev2.h"
-#include "../../exynos/kernel-3.10-headers/v4l2-dv-timings.h"
+#include <linux/videodev2.h>
+#include <linux/v4l2-dv-timings.h>
 
 #define NUM_VIRT_OVER_HDMI 5
 #define MAX_HDMI_VIDEO_LAYERS 1

diff --git a/libhdmi/dv_timings.c b/libhdmi/dv_timings.c
index 729b85d7c466eb0e43bbae322b918e7d936d1d39..48fb577d5f8fc94e2616c23b72e770e70150cb13 100644 (file)
--- a/libhdmi/dv_timings.c
+++ b/libhdmi/dv_timings.c
@@ -1,5 +1,5 @@
-#include "../../exynos/kernel-3.10-headers/videodev2.h"
-#include "../../exynos/kernel-3.10-headers/v4l2-dv-timings.h"
+#include <linux/videodev2.h>
+#include <linux/v4l2-dv-timings.h>
 #include "decon_tv.h"
 
 const struct v4l2_dv_timings dv_timings[] = {

diff --git a/libhdmi_dummy/Android.mk b/libhdmi_dummy/Android.mk
index 996e62ede09914f4793a88e29dfcbe92a0391bf3..d3c1513359a4cc16413c88ff38a7d0d085007317 100644 (file)
--- a/libhdmi_dummy/Android.mk
+++ b/libhdmi_dummy/Android.mk
@@ -21,6 +21,7 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils \
                          libmpp
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \
        $(LOCAL_PATH)/../include \
@@ -38,6 +39,9 @@ else
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libdisplay
 endif
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_SRC_FILES := \
        ExynosExternalDisplay.cpp
 

diff --git a/libhdmi_legacy/Android.mk b/libhdmi_legacy/Android.mk
index 5fe094b31f1f33b5053ce78495baeff838121ef0..743c5056a9fef63d5295f0f1ca7485a973d599d8 100644 (file)
--- a/libhdmi_legacy/Android.mk
+++ b/libhdmi_legacy/Android.mk
@@ -23,6 +23,7 @@ LOCAL_CFLAGS += -DLOG_TAG=\"hdmi\"
 LOCAL_CFLAGS += -DHLOG_CODE=2
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \
        $(LOCAL_PATH)/../include \
@@ -35,6 +36,9 @@ LOCAL_C_INCLUDES := \
        $(TOP)/hardware/samsung_slsi/exynos/libmpp \
        $(TOP)/system/core/libsync/include
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_SRC_FILES := \
        ExynosExternalDisplay.cpp
 

diff --git a/libhdmi_legacy/dv_timings.c b/libhdmi_legacy/dv_timings.c
index 00ad814626ebbc5f601cccb422c2cf37a44625bb..550d421369d88a90ec0dc4d96e00eedc276f4334 100644 (file)
--- a/libhdmi_legacy/dv_timings.c
+++ b/libhdmi_legacy/dv_timings.c
@@ -1,5 +1,5 @@
-#include "../../exynos/kernel-3.10-headers/videodev2.h"
-#include "../../exynos/kernel-3.10-headers/v4l2-dv-timings.h"
+#include <linux/videodev2.h>
+#include <linux/v4l2-dv-timings.h>
 
 const struct v4l2_dv_timings dv_timings[] = {
      V4L2_DV_BT_CEA_720X480P59_94,

diff --git a/libhwc/Android.mk b/libhwc/Android.mk
index 36c7fec48b13a4d55b7c26cade2e9e4c7a3254f8..ed228ac0d5fc129bb42563a6bf113d28cb38b5cb 100644 (file)
--- a/libhwc/Android.mk
+++ b/libhwc/Android.mk
@@ -95,6 +95,7 @@ LOCAL_CFLAGS += -DLOG_TAG=\"hwcomposer\"
 LOCAL_CFLAGS += -DHLOG_CODE=0
 
 LOCAL_C_INCLUDES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \
        $(LOCAL_PATH)/../include \
@@ -113,6 +114,9 @@ else
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libdisplay
 endif
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_SRC_FILES := ExynosHWC.cpp
 
 LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)

diff --git a/libhwc/ExynosHWC.h b/libhwc/ExynosHWC.h
index 8f8b7350f4fd9858926fc2954c142892e2198465..f9ff2a945991cad5b27e457ba5d1bc7a5d0dd9bf 100644 (file)
--- a/libhwc/ExynosHWC.h
+++ b/libhwc/ExynosHWC.h
@@ -68,7 +68,7 @@
 #include "s5p_tvout_v4l2.h"
 #include "ExynosHWCModule.h"
 #include "ExynosRect.h"
-#include "videodev2.h"
+#include <linux/videodev2.h>
 
 #ifdef USE_FB_PHY_LINEAR
 const size_t NUM_HW_WIN_FB_PHY = 5;

diff --git a/libhwcService/ExynosHWCService.cpp b/libhwcService/ExynosHWCService.cpp
index 257afe94da366f282282eb15565ff5422c8ba9da..61d7068ab3e464ac8b38e2c592efab5cae21d4ce 100644 (file)
--- a/libhwcService/ExynosHWCService.cpp
+++ b/libhwcService/ExynosHWCService.cpp
@@ -15,7 +15,7 @@
  */
 #include "ExynosHWCService.h"
 #include "exynos_v4l2.h"
-#include "videodev2_exynos_media.h"
+#include <linux/videodev2_exynos_media.h>
 #include "ExynosOverlayDisplay.h"
 #include "ExynosExternalDisplay.h"
 #ifdef USES_VPP

diff --git a/libhwc_tiny/ExynosHWC.h b/libhwc_tiny/ExynosHWC.h
index 947c525399722fb4fd3a88940323119b0e4db2ab..a89ef1d3ed21df2f7d1844ac3ceca967e7286125 100644 (file)
--- a/libhwc_tiny/ExynosHWC.h
+++ b/libhwc_tiny/ExynosHWC.h
@@ -59,7 +59,7 @@
 #include "ExynosHWCModule.h"
 #include "s5p_tvout_v4l2.h"
 #include "ExynosRect.h"
-#include "videodev2.h"
+#include <linux/videodev2.h>
 
 
 #ifdef __GNUC__

diff --git a/libhwcutils/Android.mk b/libhwcutils/Android.mk
index e70c360c914a66bef06f0c77e06e513cf795f6e2..370ded1e08ae749398e6a5941468142409ec129b 100644 (file)
--- a/libhwcutils/Android.mk
+++ b/libhwcutils/Android.mk
@@ -39,6 +39,7 @@ endif
 LOCAL_CFLAGS += -DLOG_TAG=\"hwcutils\"
 LOCAL_CFLAGS += -DHLOG_CODE=4
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \
        $(LOCAL_PATH)/../include \
@@ -54,6 +55,9 @@ else
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libdisplay
 endif
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(BOARD_HDMI_INCAPABLE), true)
 LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi/exynos/libhdmi_dummy
 else

diff --git a/libmpp/Android.mk b/libmpp/Android.mk
index d1058f080f3178da727fffb61e3a3f55eec307f7..63d4603b770c361b124d8a2e00e67ab40578c0fc 100644 (file)
--- a/libmpp/Android.mk
+++ b/libmpp/Android.mk
@@ -19,6 +19,7 @@ LOCAL_PRELINK_MODULE := false
 LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils libexynosv4l2
 
 LOCAL_C_INCLUDES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(LOCAL_PATH)/../include \
        $(TOP)/hardware/samsung_slsi/exynos/include \
        $(TOP)/hardware/samsung_slsi/exynos/libexynosutils \
@@ -26,6 +27,9 @@ LOCAL_C_INCLUDES += \
        $(TOP)/hardware/samsung_slsi/exynos4/include \
        $(TOP)/hardware/samsung_slsi/exynos5/include
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_SRC_FILES := MppFactory.cpp
 LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE := libmpp

diff --git a/libmpp/LibMpp.h b/libmpp/LibMpp.h
index ec537c352c1cc6a56af2f42fdaf606af853943da..aadfb828a035a6beb01a45431734959c4ca43214 100644 (file)
--- a/libmpp/LibMpp.h
+++ b/libmpp/LibMpp.h
@@ -4,7 +4,7 @@
 #include <cutils/log.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <videodev2.h>
+#include <linux/videodev2.h>
 #include <fcntl.h>
 #include <stdbool.h>
 #include <string.h>

diff --git a/libscaler/Android.mk b/libscaler/Android.mk
index 7edae57770896f02c62a8ad9c2de78080a485ef0..02960d54fb91c11c71cdbafee6f897f013c152ad 100644 (file)
--- a/libscaler/Android.mk
+++ b/libscaler/Android.mk
@@ -19,10 +19,14 @@ LOCAL_PRELINK_MODULE := false
 LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils libexynosv4l2
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(LOCAL_PATH)/../include \
        $(TOP)/hardware/samsung_slsi/exynos/include \
        $(TOP)/hardware/samsung_slsi/exynos/libexynosutils
 
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_SRC_FILES := libscaler.cpp libscaler-v4l2.cpp libscalerblend-v4l2.cpp libscaler-m2m1shot.cpp libscaler-swscaler.cpp
 ifeq ($(BOARD_USES_SCALER_M2M1SHOT), true)
 LOCAL_CFLAGS += -DSCALER_USE_M2M1SHOT

diff --git a/libv4l2/Android.mk b/libv4l2/Android.mk
index 8809fa2ac92872cdee2983cf16d187767b8de07b..cdee9d8fa19fa27959f134faf5ae29fdec288bb9 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 0f9cf95eece18688f7f52f6248bf5c4c56defc31..a13478dfaa6e2d8980120021c1eb2daae7f22682 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>
 

diff --git a/libvideocodec/Android.mk b/libvideocodec/Android.mk
index 97131bfb810a3e861cf486db2a3ae6e32d3ce450..97c216675b11a39edc11d566aba25f45186ed012 100644 (file)
--- a/libvideocodec/Android.mk
+++ b/libvideocodec/Android.mk
@@ -8,11 +8,15 @@ LOCAL_SRC_FILES := \
        enc/ExynosVideoEncoder.c
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(LOCAL_PATH)/include \
        $(TOP)/hardware/samsung_slsi/exynos/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \
        $(TOP)/system/core/libion/include
 
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi/openmax/include/khronos
 else

diff --git a/libvideocodec/dec/ExynosVideoDecoder.c b/libvideocodec/dec/ExynosVideoDecoder.c
index 4a089de75168814c8aaf50f80bebb7fe00c323e1..5b84530242260bbf07a04eb40a6c3e19eabf243c 100644 (file)
--- a/libvideocodec/dec/ExynosVideoDecoder.c
+++ b/libvideocodec/dec/ExynosVideoDecoder.c
@@ -39,12 +39,12 @@
 
 #include <sys/poll.h>
 
-#include "videodev2_exynos_media.h"
+#include <linux/videodev2_exynos_media.h>
 #ifdef USE_EXYNOS_MEDIA_EXT
-#include "videodev2_exynos_media_ext.h"
+#include <linux/videodev2_exynos_media_ext.h>
 #endif
 #ifdef USE_MFC_MEDIA
-#include "exynos_mfc_media.h"
+#include <linux/exynos_mfc_media.h>
 #endif
 
 #include <ion/ion.h>

diff --git a/libvideocodec/enc/ExynosVideoEncoder.c b/libvideocodec/enc/ExynosVideoEncoder.c
index c505a4fa66849327cc71f8cdc0e073630d981859..2a7174ae36387423dc567c029968b401db51c077 100644 (file)
--- a/libvideocodec/enc/ExynosVideoEncoder.c
+++ b/libvideocodec/enc/ExynosVideoEncoder.c
@@ -41,12 +41,12 @@
 
 #include <sys/poll.h>
 
-#include "videodev2_exynos_media.h"
+#include <linux/videodev2_exynos_media.h>
 #ifdef USE_EXYNOS_MEDIA_EXT
-#include "videodev2_exynos_media_ext.h"
+#include <linux/videodev2_exynos_media_ext.h>
 #endif
 #ifdef USE_MFC_MEDIA
-#include "exynos_mfc_media.h"
+#include <linux/exynos_mfc_media.h>
 #endif
 
 #include <ion/ion.h>

diff --git a/libvppdisplay/Android.mk b/libvppdisplay/Android.mk
index ef311a100c145fb3065f4bbe70eebd6bbcbb7eec..3aa1820bd6f76dd14e64d7418f271ebb193f0a43 100644 (file)
--- a/libvppdisplay/Android.mk
+++ b/libvppdisplay/Android.mk
@@ -30,6 +30,7 @@ ifeq ($(BOARD_USES_FB_PHY_LINEAR),true)
 endif
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \
        $(LOCAL_PATH)/../include \
@@ -41,6 +42,9 @@ LOCAL_C_INCLUDES := \
        $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/libhwcutilsmodule \
        $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/libdisplaymodule
 
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(BOARD_HDMI_INCAPABLE), true)
        LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libhdmi_dummy
 else

diff --git a/libvpphdmi/Android.mk b/libvpphdmi/Android.mk
index 5f2872a6062f791647ba29d7404d7d25acc9a53a..1a31707598bdc06589243a69d385128519c9862a 100644 (file)
--- a/libvpphdmi/Android.mk
+++ b/libvpphdmi/Android.mk
@@ -35,16 +35,6 @@ LOCAL_C_INCLUDES := \
        $(TOP)/hardware/samsung_slsi/exynos/libmpp \
        $(TOP)/system/core/libsync/include
 
-ifeq ($(filter 3.10, $(TARGET_LINUX_KERNEL_VERSION)), 3.10)
-LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi/exynos/kernel-3.10-headers
-else
-ifeq ($(filter 3.18, $(TARGET_LINUX_KERNEL_VERSION)), 3.18)
-LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi/exynos/kernel-3.18-headers
-else
-LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi/exynos/kernel-3.4-headers
-endif
-endif
-
 LOCAL_SRC_FILES := \
        ExynosExternalDisplay.cpp dv_timings.c
 

diff --git a/libvppvirtualdisplay/Android.mk b/libvppvirtualdisplay/Android.mk
index a7100505420eef7f06a37f907595c4c840ab562a..b5a025470dd709b1ba7612ce82614f5f35372187 100644 (file)
--- a/libvppvirtualdisplay/Android.mk
+++ b/libvppvirtualdisplay/Android.mk
@@ -22,6 +22,7 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils \
 LOCAL_CFLAGS += -DLOG_TAG=\"virtualdisplay\"
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(LOCAL_PATH)/../include \
        $(LOCAL_PATH)/../libhwcutils \
        $(LOCAL_PATH)/../libvppdisplay \
@@ -39,6 +40,9 @@ LOCAL_C_INCLUDES := \
        $(TOP)/hardware/samsung_slsi/exynos/libmpp \
        $(TOP)/system/core/libsync/include
 
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_SRC_FILES := \
        ExynosVirtualDisplay.cpp
 

diff --git a/libvppvirtualdisplay/ExynosVirtualDisplay.h b/libvppvirtualdisplay/ExynosVirtualDisplay.h
index 1b26425a878ef4b3af8a08e3186db6f2b57e4327..ad2807e0b1a76f3aa8ff91fd305fb4777f88c478 100644 (file)
--- a/libvppvirtualdisplay/ExynosVirtualDisplay.h
+++ b/libvppvirtualdisplay/ExynosVirtualDisplay.h
@@ -3,7 +3,7 @@
 
 #include "ExynosHWC.h"
 #include "ExynosDisplay.h"
-#include "../../exynos/kernel-3.10-headers/videodev2.h"
+#include <linux/videodev2.h>
 #ifdef USES_VDS_BGRA8888
 #include "ExynosMPPModule.h"
 #endif