diff options
author | Jiyong Park <jiyong@google.com> | 2017-07-05 19:30:04 +0900 |
---|---|---|
committer | Jiyong Park <jiyong@google.com> | 2017-07-05 19:31:37 +0900 |
commit | 4dc3d4aa3f6449b0335c489a997c6def7ff24031 (patch) | |
tree | dc30956d0f3816276b777497338d1d42f72be650 /msm8998 | |
parent | f5cf7737293bc0779f8eb1c6e2957279dd62a76d (diff) | |
download | media-4dc3d4aa3f6449b0335c489a997c6def7ff24031.tar.gz |
Build libOmxVdec and libOmxVenc with BOARD_VNDK_VERSION
Added missing header libraries and headers.
Bug: 37342627
Test: BOARD_VNDK_VERSION=current m -j libOmxVdec
Test: BOARD_VNDK_VERSION=current m -j libOmxVenc
Change-Id: Icedd09bf88d039d15c670b3bacf19b78c6facce0
Diffstat (limited to 'msm8998')
-rw-r--r-- | msm8998/mm-video-v4l2/vidc/common/Android.mk | 4 | ||||
-rw-r--r-- | msm8998/mm-video-v4l2/vidc/vdec/Android.mk | 5 | ||||
-rw-r--r-- | msm8998/mm-video-v4l2/vidc/vdec/inc/omx_swvdec_utils.h | 2 | ||||
-rw-r--r-- | msm8998/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h | 1 | ||||
-rw-r--r-- | msm8998/mm-video-v4l2/vidc/vdec/inc/ts_parser.h | 1 | ||||
-rw-r--r-- | msm8998/mm-video-v4l2/vidc/venc/Android.mk | 3 |
6 files changed, 13 insertions, 3 deletions
diff --git a/msm8998/mm-video-v4l2/vidc/common/Android.mk b/msm8998/mm-video-v4l2/vidc/common/Android.mk index be7989a..962950b 100644 --- a/msm8998/mm-video-v4l2/vidc/common/Android.mk +++ b/msm8998/mm-video-v4l2/vidc/common/Android.mk @@ -30,11 +30,15 @@ endif LOCAL_MODULE := libOmxVidcCommon LOCAL_MODULE_TAGS := optional +LOCAL_PROPRIETARY_MODULE := true LOCAL_CFLAGS := $(libmm-vidc-def) LOCAL_C_INCLUDES := $(libmm-vidc-inc) LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libcutils libdl +LOCAL_HEADER_LIBRARIES := \ + libutils_headers \ + libhardware_headers \ LOCAL_SRC_FILES := src/extra_data_handler.cpp LOCAL_SRC_FILES += src/vidc_color_converter.cpp diff --git a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk index e5e3138..9e76f68 100644 --- a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk +++ b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk @@ -115,7 +115,10 @@ LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-vdec-def) -Werror LOCAL_C_INCLUDES += $(libmm-vdec-inc) LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-vdec-add-dep) -LOCAL_HEADER_LIBRARIES := libnativebase_headers +LOCAL_HEADER_LIBRARIES := \ + libnativebase_headers \ + libhardware_headers \ + media_plugin_headers \ LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libutils diff --git a/msm8998/mm-video-v4l2/vidc/vdec/inc/omx_swvdec_utils.h b/msm8998/mm-video-v4l2/vidc/vdec/inc/omx_swvdec_utils.h index cfd3676..fd99219 100644 --- a/msm8998/mm-video-v4l2/vidc/vdec/inc/omx_swvdec_utils.h +++ b/msm8998/mm-video-v4l2/vidc/vdec/inc/omx_swvdec_utils.h @@ -42,7 +42,7 @@ #include <queue> #include <pthread.h> -#include <cutils/log.h> +#include <log/log.h> extern unsigned int g_omx_swvdec_logmask; ///< global OMX SwVdec logmask variable extern declaration diff --git a/msm8998/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h b/msm8998/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h index b3f9140..75cfa06 100644 --- a/msm8998/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h +++ b/msm8998/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h @@ -68,7 +68,6 @@ static ptrdiff_t x; //#include <binder/MemoryHeapIon.h> //#else #endif -#include <ui/ANativeObjectBase.h> extern "C" { #include <utils/Log.h> } diff --git a/msm8998/mm-video-v4l2/vidc/vdec/inc/ts_parser.h b/msm8998/mm-video-v4l2/vidc/vdec/inc/ts_parser.h index 2d5d1a4..6d576ad 100644 --- a/msm8998/mm-video-v4l2/vidc/vdec/inc/ts_parser.h +++ b/msm8998/mm-video-v4l2/vidc/vdec/inc/ts_parser.h @@ -36,6 +36,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <stdio.h> #include <inttypes.h> +#include <pthread.h> #ifdef _ANDROID_ extern "C" { diff --git a/msm8998/mm-video-v4l2/vidc/venc/Android.mk b/msm8998/mm-video-v4l2/vidc/venc/Android.mk index cc37522..11fd214 100644 --- a/msm8998/mm-video-v4l2/vidc/venc/Android.mk +++ b/msm8998/mm-video-v4l2/vidc/venc/Android.mk @@ -118,6 +118,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-venc-add-dep) LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libcutils libdl +LOCAL_HEADER_LIBRARIES := \ + media_plugin_headers \ + libhardware_headers \ ifeq ($(BOARD_USES_ADRENO), true) LOCAL_SHARED_LIBRARIES += libc2dcolorconvert |