exynos5: Add kernel headers to include path

Change-Id: Ided9ea5f0ce73a000f1f7b7b8f665edf3efcf90a

diff --git a/include/ExynosCamera.h b/include/ExynosCamera.h
index 0d280211ca54e503ff0c1849e70a1f1cc4728cae..e6b95b5275bc8a339a771f8fe159842c28cc3252 100644 (file)
--- a/include/ExynosCamera.h
+++ b/include/ExynosCamera.h
@@ -56,8 +56,8 @@
 #include <sys/stat.h>
 #include <sys/types.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/libgscaler/Android.mk b/libgscaler/Android.mk
index c1d7f2fc1588399e0b569c112786eb6353f37439..d72c1384f8ad854357d972aeddfa7cfe3b5c5b56 100644 (file)
--- a/libgscaler/Android.mk
+++ b/libgscaler/Android.mk
@@ -25,11 +25,15 @@ LOCAL_SHARED_LIBRARIES += libMcClient
 LOCAL_STATIC_LIBRARIES := libsecurepath
 
 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 \
        $(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/libscaler/libscaler-m2m1shot.cpp b/libscaler/libscaler-m2m1shot.cpp
index 74d4b9263c347e19e34bc363871d4722c514c630..86dd043bd015c18b8efdbb713c301d5b86f36d8a 100644 (file)
--- a/libscaler/libscaler-m2m1shot.cpp
+++ b/libscaler/libscaler-m2m1shot.cpp
@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include <videodev2.h>
+#include <linux/videodev2.h>
 
 #include <exynos_scaler.h>