diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-03-06 13:40:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-06 13:40:23 +0000 |
| commit | f86d09c1efbf60758178f6bd8c3a17e9857473d6 (patch) | |
| tree | e2baf7fcf2d2821cd35a7a7cfe37d96ec8c8116c | |
| parent | 38a691316867552989c2ac8336ca1ed404c29308 (diff) | |
| parent | 7f73bd68471c4add7d3746a59aef9ac947a79430 (diff) | |
| download | media-o-preview.tar.gz | |
Merge "Revert "For msm8996, replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK""android-o-preview-1android-n-mr2-preview-2o-preview
| -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, 33 insertions, 4 deletions
diff --git a/msm8996/libc2dcolorconvert/Android.mk b/msm8996/libc2dcolorconvert/Android.mk index dd26d49..9b8d9a5 100644 --- a/msm8996/libc2dcolorconvert/Android.mk +++ b/msm8996/libc2dcolorconvert/Android.mk @@ -13,7 +13,6 @@ 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 61b687a..b658ca9 100644 --- a/msm8996/mm-core/Android.mk +++ b/msm8996/mm-core/Android.mk @@ -53,6 +53,39 @@ 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 ef02c01..3bfd614 100644 --- a/msm8996/mm-video-v4l2/vidc/common/Android.mk +++ b/msm8996/mm-video-v4l2/vidc/common/Android.mk @@ -39,7 +39,6 @@ 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 6571980..a1c04ea 100644 --- a/msm8996/mm-video-v4l2/vidc/vdec/Android.mk +++ b/msm8996/mm-video-v4l2/vidc/vdec/Android.mk @@ -116,7 +116,6 @@ 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 dea107e..25e9601 100644 --- a/msm8996/mm-video-v4l2/vidc/venc/Android.mk +++ b/msm8996/mm-video-v4l2/vidc/venc/Android.mk @@ -90,7 +90,6 @@ 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 |