diff options
| author | Jiyong Park <jiyong@google.com> | 2018-03-28 13:40:43 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2018-03-28 14:14:04 +0900 |
| commit | 5e2d3e840e48e3c284e04789b527247a7b0ec377 (patch) | |
| tree | 8e7f7e7d268dc6de3f0db0357c9422e5579baaff /mm-video-v4l2 | |
| parent | 26535a59774787f648b6b2d4c0b52790f193b686 (diff) | |
| download | media-5e2d3e840e48e3c284e04789b527247a7b0ec377.tar.gz | |
Build libOmxVdec and libOmxVenc with VNDK
Missing media/hardware/*.h are resolved by adding media_plugin_headers
explicitly.
Missing system/graphics.h is resolved by switching system/window.h
to cutils/native_handle.h as in
I7214dcc1e57f2a0466fc28173dd5de5d54c9a721 for msm8998.
Missing hardware/gralloc.h is resolved by adding libhardware_headers
ui/ANativeObjectBase.h is not included as it isn't used.
Bug: 69574580
Test: m -j
Test: BOARD_VNDK_VERSION=current m -j libOmxVdec libOmxVenc
Change-Id: I10c903701842c1953eeb99f9651a64e1ffbbbad9
Diffstat (limited to 'mm-video-v4l2')
| -rwxr-xr-x | mm-video-v4l2/vidc/vdec/Android.mk | 3 | ||||
| -rwxr-xr-x | mm-video-v4l2/vidc/vdec/inc/omx_vdec.h | 1 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/inc/ts_parser.h | 1 | ||||
| -rwxr-xr-x | mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 1 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index 03bc39b5..e718393d 100755 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -109,6 +109,9 @@ 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 diff --git a/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h b/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h index 56a7db22..86126c7e 100755 --- a/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h +++ b/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h @@ -73,7 +73,6 @@ extern "C" { //#include <binder/MemoryHeapIon.h> //#else #endif -#include <ui/ANativeObjectBase.h> #include <linux/videodev2.h> #define VALID_TS(ts) ((ts < LLONG_MAX)? true : false) #include <poll.h> diff --git a/mm-video-v4l2/vidc/vdec/inc/ts_parser.h b/mm-video-v4l2/vidc/vdec/inc/ts_parser.h index 2d5d1a40..dcf12350 100644 --- a/mm-video-v4l2/vidc/vdec/inc/ts_parser.h +++ b/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> // pthread_mutex_* #ifdef _ANDROID_ extern "C" { diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp index 2aa3fc2a..0f45c3ef 100755 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -55,6 +55,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <media/hardware/HardwareAPI.h> #include <sys/eventfd.h> #include "PlatformConfig.h" +#include <nativebase/nativebase.h> #if !defined(_ANDROID_) || defined(SYS_IOCTL) #include <sys/ioctl.h> diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index d3320612..c74a9ca4 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -101,6 +101,8 @@ 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 |