diff options
| author | Vijay Venkatraman <vijaykv@google.com> | 2016-12-06 17:30:54 -0800 |
|---|---|---|
| committer | Vijay Venkatraman <vijaykv@google.com> | 2017-01-18 19:39:36 -0800 |
| commit | 7bbd6afa54e361119c348c96eada150d998b3246 (patch) | |
| tree | 68920abd42c5fe6380136181c9ace79e25953d4f /msm8974/mm-video-v4l2/vidc/vdec.mk | |
| parent | 0655dec92ac04cc6084f0f3a32df6a4c492caf4b (diff) | |
| download | media-7bbd6afa54e361119c348c96eada150d998b3246.tar.gz | |
Replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK
Moved msm8974/mm-core header files from inc/ to inc/mm-core/omxcore for exporting.
Moved msm8974/mm-video-v4l2/DivxDrmDecrypt headers to subfolder for exporting.
Moved msm8974/libstagefrighthw headers to include/ folder for exporting
In msm8974/mm-core, inc/ has newer OMX_* headers than inc/mm-core/omxcore and
frameworks/native/include/media/openmax. Updating these headers will be
handled in a separate CL.
Test: Add lib to LOCAL_EXPORT_SHARED_LIBRARIES
Change-Id: I4cdfe3085a459abdbd3de491eed10cdceadc4a85
Diffstat (limited to 'msm8974/mm-video-v4l2/vidc/vdec.mk')
| -rw-r--r-- | msm8974/mm-video-v4l2/vidc/vdec.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/msm8974/mm-video-v4l2/vidc/vdec.mk b/msm8974/mm-video-v4l2/vidc/vdec.mk index f6f2f24..6e9f641 100644 --- a/msm8974/mm-video-v4l2/vidc/vdec.mk +++ b/msm8974/mm-video-v4l2/vidc/vdec.mk @@ -97,12 +97,8 @@ 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 -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 += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc/mm-video-v4l2/DivxDrmDecrypt/ libmm-vdec-inc += frameworks/native/include/media/hardware libmm-vdec-inc += $(vdec-inc) libmm-vdec-inc += hardware/qcom/media/msm8974/libc2dcolorconvert @@ -117,7 +113,7 @@ LOCAL_C_INCLUDES += $(libmm-vdec-inc) LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt -LOCAL_SHARED_LIBRARIES += libqdMetaData +LOCAL_SHARED_LIBRARIES += libqdMetaData libstagefrighthw libOmxCore LOCAL_SRC_FILES := vdec/src/frameparser.cpp LOCAL_SRC_FILES += vdec/src/h264_utils.cpp @@ -128,7 +124,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 -libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display +LOCAL_SHARED_LIBRARIES += gralloc.$(TARGET_BOARD_PLATFORM) copybit.$(TARGET_BOARD_PLATFORM) LOCAL_SRC_FILES += vdec/src/power_module.cpp LOCAL_SRC_FILES += vdec/src/omx_vdec.cpp endif @@ -160,6 +156,7 @@ 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 |