diff options
Diffstat (limited to 'mm-video-v4l2/vidc/vdec/Android.mk')
| -rwxr-xr-x[-rw-r--r--] | mm-video-v4l2/vidc/vdec/Android.mk | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index 84ee1855..3f8fa799 100644..100755 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -55,19 +55,19 @@ include $(CLEAR_VARS) # Common Includes libmm-vdec-inc := $(LOCAL_PATH)/inc -libmm-vdec-inc += $(TOP)/hardware/qcom/media/mm-video-v4l2/vidc/common/inc -libmm-vdec-inc += $(TOP)/hardware/qcom/media/mm-core/inc -libmm-vdec-inc += hardware/qcom/media/libplatformconfig +libmm-vdec-inc += $(QCOM_MEDIA_ROOT)/mm-video-v4l2/vidc/common/inc +libmm-vdec-inc += $(QCOM_MEDIA_ROOT)/mm-core/inc +libmm-vdec-inc += $(QCOM_MEDIA_ROOT)/libplatformconfig libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno -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 -libmm-vdec-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include +libmm-vdec-inc += $(QCOM_MEDIA_ROOT)/libc2dcolorconvert +libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/SwVdec +libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/swvdec +libmm-vdec-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include ifeq ($(PLATFORM_SDK_VERSION), 18) #JB_MR2 libmm-vdec-def += -DANDROID_JELLYBEAN_MR2=1 -libmm-vdec-inc += $(TOP)/hardware/qcom/media/libstagefrighthw +libmm-vdec-inc += $(QCOM_MEDIA_ROOT)/libstagefrighthw endif # Common Dependencies @@ -110,11 +110,17 @@ LOCAL_SHARED_LIBRARIES := liblog libcutils libdl LOCAL_SHARED_LIBRARIES += libc2dcolorconvert LOCAL_SHARED_LIBRARIES += libqdMetaData LOCAL_SHARED_LIBRARIES += libplatformconfig +LOCAL_SHARED_LIBRARIES += libnativewindow +LOCAL_HEADER_LIBRARIES := libnativebase_headers +LOCAL_HEADER_LIBRARIES += media_plugin_headers +LOCAL_HEADER_LIBRARIES += libhardware_headers LOCAL_SRC_FILES := src/ts_parser.cpp LOCAL_STATIC_LIBRARIES := libOmxVidcCommon LOCAL_SRC_FILES += src/omx_vdec_v4l2.cpp +LOCAL_CFLAGS += -Wno-error + include $(BUILD_SHARED_LIBRARY) @@ -143,6 +149,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-vdec-add-dep) LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libcutils libc2dcolorconvert libswvdec +LOCAL_SHARED_LIBRARIES += libnativewindow LOCAL_SRC_FILES := src/omx_swvdec.cpp LOCAL_SRC_FILES += src/omx_swvdec_utils.cpp |