From cd382cab992af5d27248680218757abb0eb603c3 Mon Sep 17 00:00:00 2001 From: "Christopher N. Hesse" Date: Wed, 8 Jul 2015 12:09:57 +0200 Subject: [PATCH] vp9, hevc, vp8: Add kernel headers to include path Change-Id: Ib2c9b1819b2c60a410673c68618475c79a947b88 --- component/video/dec/hevc/Android.mk | 4 ++++ component/video/dec/vp9/Android.mk | 4 ++++ component/video/enc/hevc/Android.mk | 4 ++++ component/video/enc/vp8/Android.mk | 4 ++++ component/video/enc/vp9/Android.mk | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/component/video/dec/hevc/Android.mk b/component/video/dec/hevc/Android.mk index 46cab60..e2bc4eb 100644 --- a/component/video/dec/hevc/Android.mk +++ b/component/video/dec/hevc/Android.mk @@ -56,6 +56,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \ libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion libhardware LOCAL_C_INCLUDES := \ + $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ $(EXYNOS_OMX_INC)/exynos \ $(EXYNOS_OMX_TOP)/osal \ $(EXYNOS_OMX_TOP)/core \ @@ -65,6 +66,9 @@ LOCAL_C_INCLUDES := \ $(TOP)/hardware/samsung_slsi/exynos/include \ $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/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/vp9/Android.mk b/component/video/dec/vp9/Android.mk index db97bec..3be8330 100644 --- a/component/video/dec/vp9/Android.mk +++ b/component/video/dec/vp9/Android.mk @@ -42,6 +42,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \ libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion libhardware 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/$(TARGET_BOARD_PLATFORM)/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/hevc/Android.mk b/component/video/enc/hevc/Android.mk index a3b8c9f..009e481 100644 --- a/component/video/enc/hevc/Android.mk +++ b/component/video/enc/hevc/Android.mk @@ -51,6 +51,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \ libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion libhardware LOCAL_C_INCLUDES := \ + $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ $(EXYNOS_OMX_INC)/exynos \ $(EXYNOS_OMX_TOP)/osal \ $(EXYNOS_OMX_TOP)/core \ @@ -60,6 +61,9 @@ LOCAL_C_INCLUDES := \ $(TOP)/hardware/samsung_slsi/exynos/include \ $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/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/vp8/Android.mk b/component/video/enc/vp8/Android.mk index 710bc97..fc6fc01 100644 --- a/component/video/enc/vp8/Android.mk +++ b/component/video/enc/vp8/Android.mk @@ -46,6 +46,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \ libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion libhardware LOCAL_C_INCLUDES := \ + $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ $(EXYNOS_OMX_INC)/exynos \ $(EXYNOS_OMX_TOP)/osal \ $(EXYNOS_OMX_TOP)/core \ @@ -55,6 +56,9 @@ LOCAL_C_INCLUDES := \ $(TOP)/hardware/samsung_slsi/exynos/include \ $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/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/vp9/Android.mk b/component/video/enc/vp9/Android.mk index 3f77379..15da7c7 100644 --- a/component/video/enc/vp9/Android.mk +++ b/component/video/enc/vp9/Android.mk @@ -45,6 +45,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \ libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion libhardware LOCAL_C_INCLUDES := \ + $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ $(EXYNOS_OMX_INC)/exynos \ $(EXYNOS_OMX_TOP)/osal \ $(EXYNOS_OMX_TOP)/core \ @@ -54,6 +55,9 @@ LOCAL_C_INCLUDES := \ $(TOP)/hardware/samsung_slsi/exynos/include \ $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/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 -- 2.20.1