diff options
Diffstat (limited to 'mm-video-v4l2/vidc/venc/Android.mk')
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index a3617d02..53973606 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -57,13 +57,13 @@ libmm-venc-def += -DUSE_CAMERA_METABUFFER_UTILS # Common Includes libmm-venc-inc := $(LOCAL_PATH)/inc -libmm-venc-inc += $(TOP)/hardware/qcom/media/mm-video-v4l2/vidc/common/inc -libmm-venc-inc += hardware/qcom/media/mm-core/inc -libmm-venc-inc += hardware/qcom/media/libstagefrighthw -libmm-venc-inc += hardware/qcom/media/libplatformconfig +libmm-venc-inc += $(QCOM_MEDIA_ROOT)/mm-video-v4l2/vidc/common/inc +libmm-venc-inc += $(QCOM_MEDIA_ROOT)/mm-core/inc +libmm-venc-inc += $(QCOM_MEDIA_ROOT)/libstagefrighthw +libmm-venc-inc += $(QCOM_MEDIA_ROOT)/libplatformconfig libmm-venc-inc += $(TARGET_OUT_HEADERS)/qcom/display libmm-venc-inc += $(TARGET_OUT_HEADERS)/adreno -libmm-venc-inc += hardware/qcom/media/libc2dcolorconvert +libmm-venc-inc += $(QCOM_MEDIA_ROOT)/libc2dcolorconvert libmm-venc-inc += $(TARGET_OUT_HEADERS)/libvqzip libmm-venc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include @@ -97,17 +97,23 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-venc-add-dep) LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libplatformconfig +LOCAL_SHARED_LIBRARIES += libnativewindow # ifeq ($(BOARD_USES_ADRENO), true) LOCAL_SHARED_LIBRARIES += libc2dcolorconvert # endif # ($(BOARD_USES_ADRENO), true) LOCAL_SHARED_LIBRARIES += libqdMetaData LOCAL_STATIC_LIBRARIES := libOmxVidcCommon +LOCAL_HEADER_LIBRARIES := media_plugin_headers +LOCAL_HEADER_LIBRARIES += libhardware_headers LOCAL_SRC_FILES := src/omx_video_base.cpp LOCAL_SRC_FILES += src/omx_video_encoder.cpp LOCAL_SRC_FILES += src/video_encoder_device_v4l2.cpp +# Suppress warnings until they are fixed in video_encoder_device_v4l2.cpp +LOCAL_CFLAGS += -Wno-error=implicit-fallthrough + include $(BUILD_SHARED_LIBRARY) ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_VENC_MPEG4)),true) @@ -136,6 +142,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-venc-add-dep) LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libplatformconfig libMpeg4SwEncoder +LOCAL_SHARED_LIBRARIES += libnativewindow LOCAL_SHARED_LIBRARIES += libqdMetaData ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_SUPPORT_SW_VENC_ROTATION)),true) @@ -143,6 +150,8 @@ LOCAL_SHARED_LIBRARIES += libui LOCAL_SHARED_LIBRARIES += libutils endif +LOCAL_HEADER_LIBRARIES := media_plugin_headers + # ifeq ($(BOARD_USES_ADRENO), true) LOCAL_SHARED_LIBRARIES += libc2dcolorconvert # endif # ($(BOARD_USES_ADRENO), true) |