diff options
| author | Vijay Venkatraman <vijaykv@google.com> | 2017-03-03 13:41:11 -0800 |
|---|---|---|
| committer | Vijay Venkatraman <vijaykv@google.com> | 2017-03-06 11:19:31 -0800 |
| commit | ae5de9cc93242735c14797c1e641176e47106792 (patch) | |
| tree | 34f5978d9b96fe0673cbb56a4710477c8821a324 /msm8996 | |
| parent | a5bf317aa35f90b6fcc533882760f86342b79547 (diff) | |
| download | media-ae5de9cc93242735c14797c1e641176e47106792.tar.gz | |
For msm8996, replacing LOCAL_COPY_HEADERS with
LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK
Headers exported by libOmxCore are already being exported by
OmxCore_headers
Bug: 33241851
Test: build sailfish target and pass cts-camera tests
Change-Id: Ie120b32350e26cf5cae3c6ab7050fe5a20a9e634
Diffstat (limited to 'msm8996')
| -rw-r--r-- | msm8996/libc2dcolorconvert/Android.mk | 1 | ||||
| -rw-r--r-- | msm8996/mm-core/Android.mk | 33 | ||||
| -rw-r--r-- | msm8996/mm-video-v4l2/vidc/common/Android.mk | 1 | ||||
| -rw-r--r-- | msm8996/mm-video-v4l2/vidc/vdec/Android.mk | 1 | ||||
| -rw-r--r-- | msm8996/mm-video-v4l2/vidc/venc/Android.mk | 1 |
5 files changed, 4 insertions, 33 deletions
diff --git a/msm8996/libc2dcolorconvert/Android.mk b/msm8996/libc2dcolorconvert/Android.mk index 9b8d9a5..dd26d49 100644 --- a/msm8996/libc2dcolorconvert/Android.mk +++ b/msm8996/libc2dcolorconvert/Android.mk @@ -13,6 +13,7 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include endif LOCAL_SHARED_LIBRARIES := liblog libdl +LOCAL_HEADER_LIBRARIES := copybit_headers LOCAL_MODULE_TAGS := optional diff --git a/msm8996/mm-core/Android.mk b/msm8996/mm-core/Android.mk index 26e7e31..f165ef9 100644 --- a/msm8996/mm-core/Android.mk +++ b/msm8996/mm-core/Android.mk @@ -53,39 +53,6 @@ MM_CORE_TARGET = default endif #=============================================================================== -# Deploy the headers that can be exposed -#=============================================================================== - -LOCAL_COPY_HEADERS_TO := mm-core/omxcore -LOCAL_COPY_HEADERS := inc/OMX_Audio.h -LOCAL_COPY_HEADERS += inc/OMX_Component.h -LOCAL_COPY_HEADERS += inc/OMX_ContentPipe.h -LOCAL_COPY_HEADERS += inc/OMX_Core.h -LOCAL_COPY_HEADERS += inc/OMX_Image.h -LOCAL_COPY_HEADERS += inc/OMX_Index.h -LOCAL_COPY_HEADERS += inc/OMX_IVCommon.h -LOCAL_COPY_HEADERS += inc/OMX_Other.h -LOCAL_COPY_HEADERS += inc/OMX_QCOMExtns.h -LOCAL_COPY_HEADERS += inc/OMX_Types.h -LOCAL_COPY_HEADERS += inc/OMX_Video.h -LOCAL_COPY_HEADERS += inc/qc_omx_common.h -LOCAL_COPY_HEADERS += inc/qc_omx_component.h -LOCAL_COPY_HEADERS += inc/qc_omx_msg.h -LOCAL_COPY_HEADERS += inc/QOMX_AudioExtensions.h -LOCAL_COPY_HEADERS += inc/QOMX_AudioIndexExtensions.h -LOCAL_COPY_HEADERS += inc/OMX_CoreExt.h -LOCAL_COPY_HEADERS += inc/QOMX_CoreExtensions.h -LOCAL_COPY_HEADERS += inc/QOMX_FileFormatExtensions.h -LOCAL_COPY_HEADERS += inc/QOMX_IVCommonExtensions.h -LOCAL_COPY_HEADERS += inc/QOMX_SourceExtensions.h -LOCAL_COPY_HEADERS += inc/QOMX_VideoExtensions.h -LOCAL_COPY_HEADERS += inc/OMX_IndexExt.h -LOCAL_COPY_HEADERS += inc/OMX_VideoExt.h -LOCAL_COPY_HEADERS += inc/QOMX_StreamingExtensions.h -LOCAL_COPY_HEADERS += inc/QCMediaDefs.h -LOCAL_COPY_HEADERS += inc/QCMetaData.h - -#=============================================================================== # LIBRARY for Android apps #=============================================================================== diff --git a/msm8996/mm-video-v4l2/vidc/common/Android.mk b/msm8996/mm-video-v4l2/vidc/common/Android.mk index 3bfd614..ef02c01 100644 --- a/msm8996/mm-video-v4l2/vidc/common/Android.mk +++ b/msm8996/mm-video-v4l2/vidc/common/Android.mk @@ -39,6 +39,7 @@ endif LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libdl +LOCAL_HEADER_LIBRARIES := copybit_headers gralloc_headers LOCAL_SRC_FILES := src/extra_data_handler.cpp LOCAL_SRC_FILES += src/vidc_color_converter.cpp diff --git a/msm8996/mm-video-v4l2/vidc/vdec/Android.mk b/msm8996/mm-video-v4l2/vidc/vdec/Android.mk index a1c04ea..6571980 100644 --- a/msm8996/mm-video-v4l2/vidc/vdec/Android.mk +++ b/msm8996/mm-video-v4l2/vidc/vdec/Android.mk @@ -116,6 +116,7 @@ LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl LOCAL_SHARED_LIBRARIES += libqdMetaData +LOCAL_HEADER_LIBRARIES := copybit_headers gralloc_headers LOCAL_SRC_FILES := src/frameparser.cpp LOCAL_SRC_FILES += src/h264_utils.cpp diff --git a/msm8996/mm-video-v4l2/vidc/venc/Android.mk b/msm8996/mm-video-v4l2/vidc/venc/Android.mk index 25e9601..dea107e 100644 --- a/msm8996/mm-video-v4l2/vidc/venc/Android.mk +++ b/msm8996/mm-video-v4l2/vidc/venc/Android.mk @@ -90,6 +90,7 @@ LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \ libc2dcolorconvert libdl libgui LOCAL_SHARED_LIBRARIES += libqdMetaData +LOCAL_HEADER_LIBRARIES := copybit_headers gralloc_headers LOCAL_STATIC_LIBRARIES := libOmxVidcCommon LOCAL_SRC_FILES := src/omx_video_base.cpp |