diff options
Diffstat (limited to 'mm-video-v4l2/vidc/vdec.mk')
| -rw-r--r-- | mm-video-v4l2/vidc/vdec.mk | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mm-video-v4l2/vidc/vdec.mk b/mm-video-v4l2/vidc/vdec.mk index 15496690..a80979c5 100644 --- a/mm-video-v4l2/vidc/vdec.mk +++ b/mm-video-v4l2/vidc/vdec.mk @@ -87,14 +87,10 @@ include $(CLEAR_VARS) LOCAL_PATH:= $(ROOT_DIR) ifneq ($(TARGET_QCOM_DISPLAY_VARIANT),) -DISPLAY := display-$(TARGET_QCOM_DISPLAY_VARIANT) +PLATFORM := . libOmxVdec-def += -DDISPLAYCAF else -DISPLAY := display/$(TARGET_BOARD_PLATFORM) -# Fix the header inclusions for platform variants without an explicit path -ifneq ($(filter msm8610 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) - DISPLAY := display/msm8974 -endif +PLATFORM := msm8974 endif libmm-vdec-inc := bionic/libc/include @@ -105,13 +101,13 @@ libmm-vdec-inc += hardware/qcom/media/mm-core/inc libmm-vdec-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include #DRM include - Interface which loads the DRM library libmm-vdec-inc += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc -libmm-vdec-inc += hardware/qcom/$(DISPLAY)/libgralloc +libmm-vdec-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libgralloc libmm-vdec-inc += frameworks/native/include/media/openmax libmm-vdec-inc += frameworks/native/include/media/hardware libmm-vdec-inc += $(vdec-inc) -libmm-vdec-inc += hardware/qcom/$(DISPLAY)/libqdutils +libmm-vdec-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libqdutils libmm-vdec-inc += hardware/qcom/media/libc2dcolorconvert -libmm-vdec-inc += hardware/qcom/$(DISPLAY)/libcopybit +libmm-vdec-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libcopybit libmm-vdec-inc += frameworks/av/include/media/stagefright @@ -134,7 +130,7 @@ ifneq ($(filter msm8974 msm8610 msm8226 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM) LOCAL_SRC_FILES += vdec/src/omx_vdec_msm8974.cpp else LOCAL_SHARED_LIBRARIES += libhardware -libmm-vdec-inc += hardware/qcom/$(DISPLAY)/libhwcomposer +libmm-vdec-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libhwcomposer LOCAL_SRC_FILES += vdec/src/power_module.cpp LOCAL_SRC_FILES += vdec/src/omx_vdec.cpp endif |