diff options
author | Chirayu Desai <chirayudesai1@gmail.com> | 2014-11-12 20:18:40 +0530 |
---|---|---|
committer | Dave Daynard <nardholio@gmail.com> | 2015-10-12 14:55:23 -0400 |
commit | defb26e25670b83efa398efbb5de0264648d80fd (patch) | |
tree | e28dc0487b3451de8e4dbf46861c41aaee7aa141 | |
parent | 0e80748519c751ec8acc83d250baee908256b0bd (diff) | |
download | android_hardware_qcom_media-defb26e25670b83efa398efbb5de0264648d80fd.tar.gz android_hardware_qcom_media-defb26e25670b83efa398efbb5de0264648d80fd.tar.bz2 android_hardware_qcom_media-defb26e25670b83efa398efbb5de0264648d80fd.zip |
media: Use kernel headers
Change-Id: I7a238b7c105d58eb6ec7794ec7a6af37f63c4cb0
-rw-r--r-- | libc2dcolorconvert/Android.mk | 4 | ||||
-rw-r--r-- | mm-video-legacy/vidc/vdec.mk | 11 | ||||
-rw-r--r-- | mm-video-legacy/vidc/venc.mk | 13 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/vdec.mk | 8 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/venc.mk | 4 |
5 files changed, 39 insertions, 1 deletions
diff --git a/libc2dcolorconvert/Android.mk b/libc2dcolorconvert/Android.mk index 4edb0a59..ab7bab59 100644 --- a/libc2dcolorconvert/Android.mk +++ b/libc2dcolorconvert/Android.mk @@ -8,10 +8,14 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/qcom/display +LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include + LOCAL_SHARED_LIBRARIES := liblog libdl LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libc2dcolorconvert +LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + include $(BUILD_SHARED_LIBRARY) diff --git a/mm-video-legacy/vidc/vdec.mk b/mm-video-legacy/vidc/vdec.mk index d853abe9..b14b8938 100644 --- a/mm-video-legacy/vidc/vdec.mk +++ b/mm-video-legacy/vidc/vdec.mk @@ -44,6 +44,8 @@ libOmxVdec-def += -D_ANDROID_ICS_ libOmxVdec-def += -DUSE_ION #endif +vdec-inc := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include + # --------------------------------------------------------------------------------- # Make the Shared library (libOmxVdec) # --------------------------------------------------------------------------------- @@ -63,6 +65,7 @@ libmm-vdec-inc += frameworks/native/include/media/openmax libmm-vdec-inc += frameworks/native/include/media/hardware libmm-vdec-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert libmm-vdec-inc += frameworks/av/include/media/stagefright +libmm-vdec-inc += $(vdec-inc) LOCAL_MODULE := libOmxVdec LOCAL_MODULE_TAGS := optional @@ -83,6 +86,8 @@ LOCAL_SRC_FILES += vdec/src/omx_vdec.cpp LOCAL_SRC_FILES += common/src/extra_data_handler.cpp LOCAL_SRC_FILES += common/src/vidc_color_converter.cpp +LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + include $(BUILD_SHARED_LIBRARY) # --------------------------------------------------------------------------------- @@ -92,6 +97,7 @@ include $(CLEAR_VARS) mm-vdec-test-inc := $(call project-path-for,qcom-media)/mm-core/inc mm-vdec-test-inc += $(LOCAL_PATH)/vdec/inc +mm-vdec-test-inc += $(vdec-inc) LOCAL_MODULE := mm-vdec-omx-test LOCAL_MODULE_TAGS := optional @@ -103,6 +109,8 @@ LOCAL_SHARED_LIBRARIES := libutils liblog libOmxCore libOmxVdec libbinder LOCAL_SRC_FILES := vdec/src/queue.c LOCAL_SRC_FILES += vdec/test/omx_vdec_test.cpp +LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + include $(BUILD_EXECUTABLE) # --------------------------------------------------------------------------------- @@ -112,6 +120,7 @@ include $(CLEAR_VARS) mm-vdec-drv-test-inc := $(call project-path-for,qcom-media)/mm-core/inc mm-vdec-drv-test-inc += $(LOCAL_PATH)/vdec/inc +mm-vdec-drv-test-inc += $(vdec-inc) LOCAL_MODULE := mm-video-driver-test LOCAL_MODULE_TAGS := optional @@ -121,6 +130,8 @@ LOCAL_C_INCLUDES := $(mm-vdec-drv-test-inc) LOCAL_SRC_FILES := vdec/src/message_queue.c LOCAL_SRC_FILES += vdec/test/decoder_driver_test.c +LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + include $(BUILD_EXECUTABLE) endif #BUILD_TINY_ANDROID diff --git a/mm-video-legacy/vidc/venc.mk b/mm-video-legacy/vidc/venc.mk index ae4759b6..7b7e709d 100644 --- a/mm-video-legacy/vidc/venc.mk +++ b/mm-video-legacy/vidc/venc.mk @@ -35,6 +35,9 @@ endif ifeq ($(TARGET_USES_ION),true) libmm-venc-def += -DUSE_ION endif + +venc-inc := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include + libmm-venc-def += -D_ANDROID_ICS_ # --------------------------------------------------------------------------------- # Make the Shared library (libOmxVenc) @@ -53,6 +56,7 @@ libmm-venc-inc += frameworks/native/include/media/hardware libmm-venc-inc += frameworks/native/include/media/openmax libmm-venc-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert libmm-venc-inc += frameworks/av/include/media/stagefright +libmm-venc-inc += $(venc-inc) LOCAL_MODULE := libOmxVenc LOCAL_MODULE_TAGS := optional @@ -70,9 +74,10 @@ else LOCAL_SRC_FILES += venc/src/video_encoder_device.cpp endif - LOCAL_SRC_FILES += common/src/extra_data_handler.cpp +LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + include $(BUILD_SHARED_LIBRARY) # ----------------------------------------------------------------------------- @@ -86,6 +91,7 @@ mm-venc-test720p-inc += $(LOCAL_PATH)/venc/inc mm-venc-test720p-inc += $(OMX_VIDEO_PATH)/vidc/common/inc mm-venc-test720p-inc += $(call project-path-for,qcom-media)/mm-core/inc mm-venc-test720p-inc += $(TARGET_OUT_HEADERS)/qcom/display +mm-venc-test720p-inc += $(venc-inc) LOCAL_MODULE := mm-venc-omx-test720p LOCAL_MODULE_TAGS := optional @@ -98,6 +104,8 @@ LOCAL_SRC_FILES += venc/test/camera_test.cpp LOCAL_SRC_FILES += venc/test/venc_util.c LOCAL_SRC_FILES += venc/test/fb_test.c +LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + include $(BUILD_EXECUTABLE) # ----------------------------------------------------------------------------- @@ -107,6 +115,7 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) venc-test-inc += $(LOCAL_PATH)/venc/inc +venc-test-inc += $(venc-inc) LOCAL_MODULE := mm-video-encdrv-test LOCAL_MODULE_TAGS := optional @@ -117,6 +126,8 @@ LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/mm-core/i LOCAL_SRC_FILES := venc/test/video_encoder_test.c LOCAL_SRC_FILES += venc/test/queue.c +LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + include $(BUILD_EXECUTABLE) endif #BUILD_TINY_ANDROID diff --git a/mm-video-v4l2/vidc/vdec.mk b/mm-video-v4l2/vidc/vdec.mk index 618f2324..4e005e30 100644 --- a/mm-video-v4l2/vidc/vdec.mk +++ b/mm-video-v4l2/vidc/vdec.mk @@ -86,6 +86,8 @@ endif libOmxVdec-def += -DFLEXYUV_SUPPORTED libOmxVdec-def += -DADAPTIVE_PLAYBACK_SUPPORTED +vdec-inc = $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include + # --------------------------------------------------------------------------------- # Make the Shared library (libOmxVdec) # --------------------------------------------------------------------------------- @@ -137,6 +139,8 @@ LOCAL_SRC_FILES += common/src/vidc_color_converter.cpp # omx_vdec_msm8974.cpp:9375:16: address of array 'extra->data' will always evaluate to 'true' LOCAL_CLANG_CFLAGS += -Wno-pointer-bool-conversion +LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + include $(BUILD_SHARED_LIBRARY) @@ -170,6 +174,8 @@ LOCAL_SRC_FILES += vdec/src/hevc_utils.cpp LOCAL_SRC_FILES += common/src/extra_data_handler.cpp LOCAL_SRC_FILES += common/src/vidc_color_converter.cpp +LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + #include $(BUILD_SHARED_LIBRARY) endif @@ -212,6 +218,8 @@ LOCAL_C_INCLUDES := $(mm-vdec-drv-test-inc) LOCAL_SRC_FILES := vdec/src/message_queue.c LOCAL_SRC_FILES += vdec/test/decoder_driver_test.c +LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + #include $(BUILD_EXECUTABLE) endif #BUILD_TINY_ANDROID diff --git a/mm-video-v4l2/vidc/venc.mk b/mm-video-v4l2/vidc/venc.mk index c1e35fa0..4d37c418 100644 --- a/mm-video-v4l2/vidc/venc.mk +++ b/mm-video-v4l2/vidc/venc.mk @@ -68,6 +68,8 @@ ifeq ($(TARGET_USES_ION),true) libmm-venc-def += -DUSE_ION endif +venc-inc = $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include + libmm-venc-def += -D_ANDROID_ICS_ # --------------------------------------------------------------------------------- # Make the Shared library (libOmxVenc) @@ -106,6 +108,8 @@ endif LOCAL_SRC_FILES += common/src/extra_data_handler.cpp +LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + include $(BUILD_SHARED_LIBRARY) endif #BUILD_TINY_ANDROID |