diff options
| author | Vijay Venkatraman <vijaykv@google.com> | 2017-02-07 18:51:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-07 18:51:43 +0000 |
| commit | 07e30ae927c47c8efbb0c0c407e9619a93689a13 (patch) | |
| tree | c8f8b060658e39adc12885c2c674461b21ab4c06 /msm8974/mm-video-v4l2/vidc/vdec.mk | |
| parent | 22b44d7e8118a759bf0219cd58529bc4b79b1d38 (diff) | |
| parent | 1673ee7a262504eb7e3445c772e108eb418a106c (diff) | |
| download | media-07e30ae927c47c8efbb0c0c407e9619a93689a13.tar.gz | |
Merge "Revert "Replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK"" am: a19e87fe30 am: 6d355e61ff
am: 1673ee7a26
Change-Id: I0d153e1bd9736203db3698f0b43a7cf26ad4e658
Diffstat (limited to 'msm8974/mm-video-v4l2/vidc/vdec.mk')
| -rw-r--r-- | msm8974/mm-video-v4l2/vidc/vdec.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/msm8974/mm-video-v4l2/vidc/vdec.mk b/msm8974/mm-video-v4l2/vidc/vdec.mk index 6e9f641..f6f2f24 100644 --- a/msm8974/mm-video-v4l2/vidc/vdec.mk +++ b/msm8974/mm-video-v4l2/vidc/vdec.mk @@ -97,8 +97,12 @@ LOCAL_PATH:= $(ROOT_DIR) libmm-vdec-inc := $(LOCAL_PATH)/vdec/inc libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc +libmm-vdec-inc += hardware/qcom/media/msm8974/mm-core/inc #DRM include - Interface which loads the DRM library -libmm-vdec-inc += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc/mm-video-v4l2/DivxDrmDecrypt/ +libmm-vdec-inc += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc +libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display +libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno +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/media/msm8974/libc2dcolorconvert @@ -113,7 +117,7 @@ LOCAL_C_INCLUDES += $(libmm-vdec-inc) LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt -LOCAL_SHARED_LIBRARIES += libqdMetaData libstagefrighthw libOmxCore +LOCAL_SHARED_LIBRARIES += libqdMetaData LOCAL_SRC_FILES := vdec/src/frameparser.cpp LOCAL_SRC_FILES += vdec/src/h264_utils.cpp @@ -124,7 +128,7 @@ ifneq ($(filter msm8974 msm8610 msm8226 msm8084 msm8952 msm8992 msm8994,$(TARGET LOCAL_SRC_FILES += vdec/src/omx_vdec_msm8974.cpp else LOCAL_SHARED_LIBRARIES += libhardware -LOCAL_SHARED_LIBRARIES += gralloc.$(TARGET_BOARD_PLATFORM) copybit.$(TARGET_BOARD_PLATFORM) +libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display LOCAL_SRC_FILES += vdec/src/power_module.cpp LOCAL_SRC_FILES += vdec/src/omx_vdec.cpp endif @@ -156,7 +160,6 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt LOCAL_SHARED_LIBRARIES += libqdMetaData -LOCAL_SHARED_LIBRARIES += gralloc.$(TARGET_BOARD_PLATFORM) copybit.$(TARGET_BOARD_PLATFORM) LOCAL_SRC_FILES := vdec/src/frameparser.cpp LOCAL_SRC_FILES += vdec/src/h264_utils.cpp |