diff options
| author | Vijay Venkatraman <vijaykv@google.com> | 2017-03-06 22:01:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-06 22:01:15 +0000 |
| commit | 55bf1b1b5104dd6061ea755cc857dd18352b63fd (patch) | |
| tree | 67158952d58dc228b698d7a9a34b79528ebd9ea9 /msm8996 | |
| parent | 593aa585439c21b050f53c7f672d939803510036 (diff) | |
| parent | ae5de9cc93242735c14797c1e641176e47106792 (diff) | |
| download | media-55bf1b1b5104dd6061ea755cc857dd18352b63fd.tar.gz | |
Merge "For msm8996, replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK"
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 b658ca9..61b687a 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 |