diff options
Diffstat (limited to 'exynos4')
-rw-r--r-- | exynos4/hal/include/SecFimc.h | 1 | ||||
-rw-r--r-- | exynos4/hal/include/jpeg_hal.h | 2 | ||||
-rw-r--r-- | exynos4/hal/include/sec_utils.h | 4 | ||||
-rw-r--r-- | exynos4/hal/libgralloc_ump/Android.mk | 4 | ||||
-rw-r--r-- | exynos4/hal/libgralloc_ump/alloc_device.cpp | 6 | ||||
-rw-r--r-- | exynos4/hal/libhwcomposer/Android.mk | 1 | ||||
-rw-r--r-- | exynos4/hal/libhwcomposer/SecHWCUtils.h | 3 | ||||
-rw-r--r-- | exynos4/hal/libhwjpeg/Android.mk | 1 |
8 files changed, 10 insertions, 12 deletions
diff --git a/exynos4/hal/include/SecFimc.h b/exynos4/hal/include/SecFimc.h index 61585c2..a65bda6 100644 --- a/exynos4/hal/include/SecFimc.h +++ b/exynos4/hal/include/SecFimc.h @@ -42,7 +42,6 @@ extern "C" { #include <unistd.h> #include <errno.h> #include <fcntl.h> -#include <asm/sizes.h> #include <sys/ioctl.h> #include <sys/types.h> diff --git a/exynos4/hal/include/jpeg_hal.h b/exynos4/hal/include/jpeg_hal.h index 5c55592..eddb08c 100644 --- a/exynos4/hal/include/jpeg_hal.h +++ b/exynos4/hal/include/jpeg_hal.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "videodev2.h" +#include <linux/videodev2.h> #define JPEG_DEC_NODE "/dev/video11" #define JPEG_ENC_NODE "/dev/video12" diff --git a/exynos4/hal/include/sec_utils.h b/exynos4/hal/include/sec_utils.h index c99dec6..046e141 100644 --- a/exynos4/hal/include/sec_utils.h +++ b/exynos4/hal/include/sec_utils.h @@ -29,8 +29,8 @@ extern "C" { #endif #include <linux/videodev2.h> -#include "videodev2_exynos_camera.h" -#include "videodev2_exynos_media.h" +//#include "videodev2_exynos_camera.h" +//#include "videodev2_exynos_media.h" #ifdef __cplusplus } diff --git a/exynos4/hal/libgralloc_ump/Android.mk b/exynos4/hal/libgralloc_ump/Android.mk index 0a25e68..311c56e 100644 --- a/exynos4/hal/libgralloc_ump/Android.mk +++ b/exynos4/hal/libgralloc_ump/Android.mk @@ -29,7 +29,9 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_SHARED_LIBRARIES := liblog libcutils libUMP libGLESv1_CM libsecion # Include the UMP header files -LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include +LOCAL_C_INCLUDES += \ + bionic/libc/include \ + $(LOCAL_PATH)/../include LOCAL_SRC_FILES := \ gralloc_module.cpp \ diff --git a/exynos4/hal/libgralloc_ump/alloc_device.cpp b/exynos4/hal/libgralloc_ump/alloc_device.cpp index 05df8d1..10a8e72 100644 --- a/exynos4/hal/libgralloc_ump/alloc_device.cpp +++ b/exynos4/hal/libgralloc_ump/alloc_device.cpp @@ -56,13 +56,9 @@ #include <sys/stat.h> #include <sys/types.h> #include <sys/ioctl.h> - -#if HAVE_ANDROID_OS -#include <linux/android_pmem.h> #include <pixelflinger/format.h> -#endif -#include "videodev2.h" +#include <linux/videodev2.h> #include "s5p_fimc.h" #ifdef SAMSUNG_EXYNOS4x12 diff --git a/exynos4/hal/libhwcomposer/Android.mk b/exynos4/hal/libhwcomposer/Android.mk index 29acb51..08b75e0 100644 --- a/exynos4/hal/libhwcomposer/Android.mk +++ b/exynos4/hal/libhwcomposer/Android.mk @@ -24,6 +24,7 @@ LOCAL_SHARED_LIBRARIES := liblog libcutils libEGL \ libGLESv1_CM libhardware libhardware_legacy LOCAL_C_INCLUDES := \ + bionic/libc/include \ $(TARGET_HAL_PATH)/include LOCAL_SRC_FILES := SecHWCLog.cpp SecHWCUtils.cpp SecHWC.cpp diff --git a/exynos4/hal/libhwcomposer/SecHWCUtils.h b/exynos4/hal/libhwcomposer/SecHWCUtils.h index 4b7aaa4..c1b8dab 100644 --- a/exynos4/hal/libhwcomposer/SecHWCUtils.h +++ b/exynos4/hal/libhwcomposer/SecHWCUtils.h @@ -34,8 +34,7 @@ #include <errno.h> #include <cutils/log.h> -#include <linux/videodev.h> -#include "videodev2.h" +#include <linux/videodev2.h> #include "s5p_fimc.h" #include "sec_utils.h" #include <sys/ioctl.h> diff --git a/exynos4/hal/libhwjpeg/Android.mk b/exynos4/hal/libhwjpeg/Android.mk index 21a99fb..7b288fa 100644 --- a/exynos4/hal/libhwjpeg/Android.mk +++ b/exynos4/hal/libhwjpeg/Android.mk @@ -16,6 +16,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_C_INCLUDES := $(LOCAL_PATH) \ + bionic/libc/include \ $(LOCAL_PATH)/../include LOCAL_SRC_FILES:= \ |