projects / GitHub / LineageOS / android_hardware_samsung_slsi_openmax.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f439c1b)
OpenMAX: Add kernel headers to include path
authorEthan Chen <intervigil@gmail.com>
Thu, 24 Oct 2013 23:47:57 +0000 (16:47 -0700)
committerEthan Chen <intervigil@gmail.com>
Sun, 27 Oct 2013 22:43:58 +0000 (15:43 -0700)
component/common/Android.mk patch | blob | blame | history
component/video/dec/Android.mk patch | blob | blame | history
component/video/dec/h264/Android.mk patch | blob | blame | history
component/video/dec/mpeg4/Android.mk patch | blob | blame | history
component/video/dec/vp8/Android.mk patch | blob | blame | history
component/video/enc/Android.mk patch | blob | blame | history
component/video/enc/h264/Android.mk patch | blob | blame | history
component/video/enc/mpeg4/Android.mk patch | blob | blame | history
core/Android.mk patch | blob | blame | history
osal/Android.mk patch | blob | blame | history

diff --git a/component/common/Android.mk b/component/common/Android.mk
index 05c8d30ec235850fc7d2c41b6f1b80017dbd339c..7014d4e908b5556970def6d3c9064679db99a98d 100644 (file)
--- a/component/common/Android.mk
+++ b/component/common/Android.mk
@@ -15,9 +15,13 @@ LOCAL_STATIC_LIBRARIES := libExynosOMX_OSAL
 LOCAL_SHARED_LIBRARIES := libcutils libutils
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
 LOCAL_C_INCLUDES += $(EXYNOS_OMX_INC)/khronos
@@ -43,9 +47,13 @@ LOCAL_STATIC_LIBRARIES := libExynosOMX_OSAL
 LOCAL_SHARED_LIBRARIES := libcutils libutils
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
 LOCAL_C_INCLUDES += $(EXYNOS_OMX_INC)/khronos
diff --git a/component/video/dec/Android.mk b/component/video/dec/Android.mk
index be3fc0c68fb6554cc1b332a0f870b7fb61ce2d33..3a81f078562df76909e1770293c6e82fa22829b7 100644 (file)
--- a/component/video/dec/Android.mk
+++ b/component/video/dec/Android.mk
@@ -12,6 +12,7 @@ LOCAL_ARM_MODE := arm
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal \
        $(EXYNOS_OMX_TOP)/core \
@@ -21,6 +22,9 @@ LOCAL_C_INCLUDES := \
        $(TOP)/hardware/samsung_slsi/exynos/include \
        $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include
 
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_STATIC_LIBRARIES := libExynosVideoApi
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
diff --git a/component/video/dec/h264/Android.mk b/component/video/dec/h264/Android.mk
index 788da11bdca4fd6e33cd2a1b91d7ce59ff8c5825..e297018200c6e16dc606d4a0e831da7f56fbf594 100644 (file)
--- a/component/video/dec/h264/Android.mk
+++ b/component/video/dec/h264/Android.mk
@@ -42,6 +42,7 @@ LOCAL_SHARED_LIBRARIES += libexynosgscaler
 endif
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal \
        $(EXYNOS_OMX_TOP)/core \
@@ -51,6 +52,9 @@ LOCAL_C_INCLUDES := \
        $(TOP)/hardware/samsung_slsi/exynos/include \
        $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include
 
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
 LOCAL_C_INCLUDES += $(EXYNOS_OMX_INC)/khronos
diff --git a/component/video/dec/mpeg4/Android.mk b/component/video/dec/mpeg4/Android.mk
index 12eb90eae1f8d7e9c8d97fcab06f4b4c9299e39e..09d008973ceb13fd63720b61402a5e210a263deb 100644 (file)
--- a/component/video/dec/mpeg4/Android.mk
+++ b/component/video/dec/mpeg4/Android.mk
@@ -38,6 +38,7 @@ LOCAL_SHARED_LIBRARIES += libexynosgscaler
 endif
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal \
        $(EXYNOS_OMX_TOP)/core \
@@ -47,6 +48,9 @@ LOCAL_C_INCLUDES := \
        $(TOP)/hardware/samsung_slsi/exynos/include \
        $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include
 
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
 LOCAL_C_INCLUDES += $(EXYNOS_OMX_INC)/khronos
diff --git a/component/video/dec/vp8/Android.mk b/component/video/dec/vp8/Android.mk
index 28133fc3b6ac7a4d2b9b009602a6036a2c235942..e9a4322536921fc1178ad471745c6980244677de 100644 (file)
--- a/component/video/dec/vp8/Android.mk
+++ b/component/video/dec/vp8/Android.mk
@@ -35,6 +35,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
        libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos libexynosgscaler
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal \
        $(EXYNOS_OMX_TOP)/core \
@@ -44,6 +45,9 @@ LOCAL_C_INCLUDES := \
        $(TOP)/hardware/samsung_slsi/exynos/include \
        $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include
 
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
 LOCAL_C_INCLUDES += $(EXYNOS_OMX_INC)/khronos
diff --git a/component/video/enc/Android.mk b/component/video/enc/Android.mk
index 61471c3962800295e1c29482195059da1f80fffe..5b6200287ff07c96d02b84626c0d2586fcbd7c5c 100644 (file)
--- a/component/video/enc/Android.mk
+++ b/component/video/enc/Android.mk
@@ -12,6 +12,7 @@ LOCAL_ARM_MODE := arm
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal \
        $(EXYNOS_OMX_TOP)/core \
@@ -21,6 +22,9 @@ LOCAL_C_INCLUDES := \
        $(TOP)/hardware/samsung_slsi/exynos/include \
        $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include
 
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
 LOCAL_C_INCLUDES += $(EXYNOS_OMX_INC)/khronos
diff --git a/component/video/enc/h264/Android.mk b/component/video/enc/h264/Android.mk
index b7e6f5c2a1ffaf4ef3a96de5ea4d09f3421c0118..8932ac493e98fe06db812840008e3d3eb884802a 100644 (file)
--- a/component/video/enc/h264/Android.mk
+++ b/component/video/enc/h264/Android.mk
@@ -40,6 +40,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
        libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal \
        $(EXYNOS_OMX_TOP)/core \
@@ -49,6 +50,9 @@ LOCAL_C_INCLUDES := \
        $(TOP)/hardware/samsung_slsi/exynos/include \
        $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include
 
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
 LOCAL_C_INCLUDES += $(EXYNOS_OMX_INC)/khronos
diff --git a/component/video/enc/mpeg4/Android.mk b/component/video/enc/mpeg4/Android.mk
index 70423354d63978314ad3e125dd8d3ca95c948eee..5eef04478c3b94479cfea7828ac8ac424d7f1fc1 100644 (file)
--- a/component/video/enc/mpeg4/Android.mk
+++ b/component/video/enc/mpeg4/Android.mk
@@ -35,6 +35,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
        libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal \
        $(EXYNOS_OMX_TOP)/core \
@@ -44,6 +45,9 @@ LOCAL_C_INCLUDES := \
        $(TOP)/hardware/samsung_slsi/exynos/include \
        $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include
 
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
 LOCAL_C_INCLUDES += $(EXYNOS_OMX_INC)/khronos
diff --git a/core/Android.mk b/core/Android.mk
index 4b66d26b0f242f198517caba2f0a2231a344dc6f..b498671a59fe2113a57bd555c817b5928e339af7 100644 (file)
--- a/core/Android.mk
+++ b/core/Android.mk
@@ -19,10 +19,14 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils \
        libExynosOMX_Resourcemanager
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal \
        $(EXYNOS_OMX_TOP)/component/common
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
 LOCAL_C_INCLUDES += $(EXYNOS_OMX_INC)/khronos
diff --git a/osal/Android.mk b/osal/Android.mk
index 9c36287cb94a10e538574d64a1a89ab135ed62b4..8b01412ee8a745509a7d160697efcac5fbcd4dc4 100644 (file)
--- a/osal/Android.mk
+++ b/osal/Android.mk
@@ -42,6 +42,7 @@ endif
 LOCAL_STATIC_LIBRARIES := liblog libcutils libExynosVideoApi
 
 LOCAL_C_INCLUDES := \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal \
        $(EXYNOS_OMX_COMPONENT)/common \
@@ -52,6 +53,9 @@ LOCAL_C_INCLUDES := \
        $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include
 
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
 LOCAL_C_INCLUDES += $(EXYNOS_OMX_INC)/khronos