Merge "Replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK" am: 1079b0b1d3 am: 05d18dc7ca am: 1940e0bbe8
am: 22b44d7e81
Change-Id: I8bd77bd7ff158ed18277c35f5ff957e3c8cffa9c
diff --git a/msm8974/libc2dcolorconvert/Android.mk b/msm8974/libc2dcolorconvert/Android.mk
index 4edb0a5..e94a059 100644
--- a/msm8974/libc2dcolorconvert/Android.mk
+++ b/msm8974/libc2dcolorconvert/Android.mk
@@ -6,9 +6,8 @@
C2DColorConverter.cpp
LOCAL_C_INCLUDES := \
- $(TARGET_OUT_HEADERS)/qcom/display
-LOCAL_SHARED_LIBRARIES := liblog libdl
+LOCAL_SHARED_LIBRARIES := liblog libdl copybit.$(TARGET_BOARD_PLATFORM)
LOCAL_MODULE_TAGS := optional
diff --git a/msm8974/libstagefrighthw/Android.mk b/msm8974/libstagefrighthw/Android.mk
index c290177..9f0e890 100755
--- a/msm8974/libstagefrighthw/Android.mk
+++ b/msm8974/libstagefrighthw/Android.mk
@@ -23,6 +23,7 @@
LOCAL_CFLAGS := $(PV_CFLAGS_MINUS_VISIBILITY)
LOCAL_C_INCLUDES:= \
+ $(LOCAL_PATH)/include \
frameworks/native/include/media/openmax \
frameworks/native/include/media/hardware
@@ -33,9 +34,7 @@
libdl \
libui \
-LOCAL_COPY_HEADERS_TO := qcom/media
-LOCAL_COPY_HEADERS := QComOMXMetadata.h \
- QComOMXPlugin.h
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_MODULE := libstagefrighthw
diff --git a/msm8974/libstagefrighthw/QComOMXMetadata.h b/msm8974/libstagefrighthw/include/QComOMXMetadata.h
similarity index 100%
rename from msm8974/libstagefrighthw/QComOMXMetadata.h
rename to msm8974/libstagefrighthw/include/QComOMXMetadata.h
diff --git a/msm8974/libstagefrighthw/QComOMXPlugin.h b/msm8974/libstagefrighthw/include/QComOMXPlugin.h
similarity index 100%
rename from msm8974/libstagefrighthw/QComOMXPlugin.h
rename to msm8974/libstagefrighthw/include/QComOMXPlugin.h
diff --git a/msm8974/mm-core/Android.mk b/msm8974/mm-core/Android.mk
index 2e2955c..aa3f2ef 100644
--- a/msm8974/mm-core/Android.mk
+++ b/msm8974/mm-core/Android.mk
@@ -50,34 +50,7 @@
# 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
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc
#===============================================================================
# LIBRARY for Android apps
diff --git a/msm8974/mm-core/omxcore/Android.mk b/msm8974/mm-core/omxcore/Android.mk
index 19cee6d..7c93bff 100644
--- a/msm8974/mm-core/omxcore/Android.mk
+++ b/msm8974/mm-core/omxcore/Android.mk
@@ -41,23 +41,7 @@
# 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_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc
#===============================================================================
# LIBRARY for Android apps
diff --git a/msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk b/msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk
index 28f5072..735430f 100755
--- a/msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk
+++ b/msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk
@@ -5,8 +5,6 @@
# Deploy the headers that can be exposed
#===============================================================================
-LOCAL_COPY_HEADERS_TO := mm-video-v4l2/DivxDrmDecrypt
-LOCAL_COPY_HEADERS := inc/DivXDrmDecrypt.h
LOCAL_CFLAGS := \
-D_ANDROID_
@@ -15,14 +13,15 @@
src/DivXDrmDecrypt.cpp
LOCAL_C_INCLUDES:= \
- $(LOCAL_PATH)/inc \
- $(TARGET_OUT_HEADERS)/mm-core/omxcore
+ $(LOCAL_PATH)/inc/mm-video-v4l2/DivxDrmDecrypt \
LOCAL_MODULE:= libdivxdrmdecrypt
LOCAL_MODULE_TAGS := optional
-LOCAL_SHARED_LIBRARIES := liblog libdl
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc
+
+LOCAL_SHARED_LIBRARIES := liblog libdl libOmxCore
LOCAL_LDLIBS +=
include $(BUILD_SHARED_LIBRARY)
diff --git a/msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/DivXDrmDecrypt.h b/msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/mm-video-v4l2/DivxDrmDecrypt/DivXDrmDecrypt.h
similarity index 100%
rename from msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/DivXDrmDecrypt.h
rename to msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/mm-video-v4l2/DivxDrmDecrypt/DivXDrmDecrypt.h
diff --git a/msm8974/mm-video-v4l2/vidc/vdec.mk b/msm8974/mm-video-v4l2/vidc/vdec.mk
index f6f2f24..6e9f641 100644
--- a/msm8974/mm-video-v4l2/vidc/vdec.mk
+++ b/msm8974/mm-video-v4l2/vidc/vdec.mk
@@ -97,12 +97,8 @@
libmm-vdec-inc := $(LOCAL_PATH)/vdec/inc
libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
-libmm-vdec-inc += hardware/qcom/media/msm8974/mm-core/inc
#DRM include - Interface which loads the DRM library
-libmm-vdec-inc += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc
-libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display
-libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno
-libmm-vdec-inc += frameworks/native/include/media/openmax
+libmm-vdec-inc += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc/mm-video-v4l2/DivxDrmDecrypt/
libmm-vdec-inc += frameworks/native/include/media/hardware
libmm-vdec-inc += $(vdec-inc)
libmm-vdec-inc += hardware/qcom/media/msm8974/libc2dcolorconvert
@@ -117,7 +113,7 @@
LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl
LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt
-LOCAL_SHARED_LIBRARIES += libqdMetaData
+LOCAL_SHARED_LIBRARIES += libqdMetaData libstagefrighthw libOmxCore
LOCAL_SRC_FILES := vdec/src/frameparser.cpp
LOCAL_SRC_FILES += vdec/src/h264_utils.cpp
@@ -128,7 +124,7 @@
LOCAL_SRC_FILES += vdec/src/omx_vdec_msm8974.cpp
else
LOCAL_SHARED_LIBRARIES += libhardware
-libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display
+LOCAL_SHARED_LIBRARIES += gralloc.$(TARGET_BOARD_PLATFORM) copybit.$(TARGET_BOARD_PLATFORM)
LOCAL_SRC_FILES += vdec/src/power_module.cpp
LOCAL_SRC_FILES += vdec/src/omx_vdec.cpp
endif
@@ -160,6 +156,7 @@
LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt
LOCAL_SHARED_LIBRARIES += libqdMetaData
+LOCAL_SHARED_LIBRARIES += gralloc.$(TARGET_BOARD_PLATFORM) copybit.$(TARGET_BOARD_PLATFORM)
LOCAL_SRC_FILES := vdec/src/frameparser.cpp
LOCAL_SRC_FILES += vdec/src/h264_utils.cpp
diff --git a/msm8974/mm-video-v4l2/vidc/venc.mk b/msm8974/mm-video-v4l2/vidc/venc.mk
index f019bc2..50bd742 100644
--- a/msm8974/mm-video-v4l2/vidc/venc.mk
+++ b/msm8974/mm-video-v4l2/vidc/venc.mk
@@ -77,12 +77,7 @@
libmm-venc-inc := $(LOCAL_PATH)/venc/inc
libmm-venc-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
-libmm-venc-inc += hardware/qcom/media/msm8974/mm-core/inc
-libmm-venc-inc += hardware/qcom/media/msm8974/libstagefrighthw
-libmm-venc-inc += $(TARGET_OUT_HEADERS)/qcom/display
-libmm-venc-inc += $(TARGET_OUT_HEADERS)/adreno
libmm-venc-inc += frameworks/native/include/media/hardware
-libmm-venc-inc += frameworks/native/include/media/openmax
libmm-venc-inc += hardware/qcom/media/msm8974/libc2dcolorconvert
libmm-venc-inc += frameworks/av/include/media/stagefright
libmm-venc-inc += frameworks/av/include/media/hardware
@@ -94,7 +89,8 @@
LOCAL_C_INCLUDES := $(libmm-venc-inc)
LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \
- libc2dcolorconvert libdl libgui
+ libc2dcolorconvert libdl libgui libOmxCore libstagefrighthw
+LOCAL_SHARED_LIBRARIES += gralloc.$(TARGET_BOARD_PLATFORM) copybit.$(TARGET_BOARD_PLATFORM)
LOCAL_SRC_FILES := venc/src/omx_video_base.cpp
LOCAL_SRC_FILES += venc/src/omx_video_encoder.cpp
