diff options
| author | Roopesh Rajashekharaiah Nataraja <roopeshr@codeaurora.org> | 2017-11-10 11:22:34 -0800 |
|---|---|---|
| committer | Roopesh Rajashekharaiah Nataraja <roopeshr@codeaurora.org> | 2017-12-05 10:23:42 -0800 |
| commit | d0244ac3b2c25cd28e54820c83edae909b0c802e (patch) | |
| tree | aacc80b0881ecb2430602fbe203be20ffe4af5d9 /mm-video-v4l2 | |
| parent | a08399b1c97af8b667a17ff403c06e587ab00f46 (diff) | |
| download | media-d0244ac3b2c25cd28e54820c83edae909b0c802e.tar.gz | |
Remove dependency on swvdec, Mpeg4SwEncoder.
- Add header path
- Add dependent libraries
Change-Id: Ifb5bfb9cd050730c7d63402d8f4277ebc8ec070e
Diffstat (limited to 'mm-video-v4l2')
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 6 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index 94137f6c..f8dc0308 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -62,6 +62,9 @@ libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno libmm-vdec-inc += $(TOP)/frameworks/native/include/media/openmax libmm-vdec-inc += $(TOP)/frameworks/native/include/media/hardware +libmm-vdec-inc += frameworks/native/libs/nativewindow/include +libmm-vdec-inc += frameworks/native/libs/nativebase/include +libmm-vdec-inc += frameworks/native/libs/arect/include libmm-vdec-inc += $(TOP)/hardware/qcom/media/libc2dcolorconvert libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/SwVdec libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/swvdec @@ -130,8 +133,7 @@ LOCAL_C_INCLUDES += $(libmm-vdec-inc) LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-vdec-add-dep) LOCAL_PRELINK_MODULE := false -LOCAL_SHARED_LIBRARIES := liblog libcutils libc2dcolorconvert -LOCAL_SHARED_LIBRARIES += libswvdec +LOCAL_SHARED_LIBRARIES := liblog libcutils libc2dcolorconvert libswvdec LOCAL_SRC_FILES := src/omx_swvdec.cpp LOCAL_SRC_FILES += src/omx_swvdec_utils.cpp diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index 058a9024..ce10f137 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -65,6 +65,9 @@ libmm-venc-inc += $(TARGET_OUT_HEADERS)/qcom/display libmm-venc-inc += $(TARGET_OUT_HEADERS)/adreno libmm-venc-inc += frameworks/native/include/media/hardware libmm-venc-inc += frameworks/native/include/media/openmax +libmm-venc-inc += frameworks/native/libs/nativewindow/include +libmm-venc-inc += frameworks/native/libs/nativebase/include +libmm-venc-inc += frameworks/native/libs/arect/include libmm-venc-inc += hardware/qcom/media/libc2dcolorconvert libmm-venc-inc += $(TARGET_OUT_HEADERS)/libvqzip libmm-venc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include @@ -122,8 +125,7 @@ LOCAL_C_INCLUDES := $(libmm-venc-inc) LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-venc-add-dep) LOCAL_PRELINK_MODULE := false -LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libplatformconfig -LOCAL_SHARED_LIBRARIES += libMpeg4SwEncoder +LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libplatformconfig libMpeg4SwEncoder LOCAL_SHARED_LIBRARIES += libqdMetaData ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_SUPPORT_SW_VENC_ROTATION)),true) |