Exynos4: Fix build

Change-Id: Idb327b37156e2014a34a8831ce6d60769e3217af
tirimbino
sbrissen 10 years ago
parent 9b6b907dd8
commit 99008c2002
  1. 1
      exynos4/hal/include/SecFimc.h
  2. 2
      exynos4/hal/include/jpeg_hal.h
  3. 4
      exynos4/hal/include/sec_utils.h
  4. 4
      exynos4/hal/libgralloc_ump/Android.mk
  5. 6
      exynos4/hal/libgralloc_ump/alloc_device.cpp
  6. 1
      exynos4/hal/libhwcomposer/Android.mk
  7. 3
      exynos4/hal/libhwcomposer/SecHWCUtils.h
  8. 1
      exynos4/hal/libhwjpeg/Android.mk

@ -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>

@ -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"

@ -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
}

@ -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 \

@ -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

@ -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

@ -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>

@ -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:= \

Loading…
Cancel
Save