Merge "Revert "Replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK"" am: a19e87fe30 am: 6d355e61ff am: 1673ee7a26

am: 07e30ae927

Change-Id: I94ac13b79554f607d10c5e35171b7cb8839f8677

4 files changed, 18 insertions, 10 deletions

diff --git a/msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk b/msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk
index 735430f..28f5072 100755
--- a/msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk
+++ b/msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk
@@ -5,6 +5,8 @@ include $(CLEAR_VARS)
 #            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_
@@ -13,15 +15,14 @@ LOCAL_SRC_FILES:=       \
     src/DivXDrmDecrypt.cpp
 
 LOCAL_C_INCLUDES:= \
-    $(LOCAL_PATH)/inc/mm-video-v4l2/DivxDrmDecrypt \
+    $(LOCAL_PATH)/inc \
+    $(TARGET_OUT_HEADERS)/mm-core/omxcore
 
 
 LOCAL_MODULE:= libdivxdrmdecrypt
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc
-
-LOCAL_SHARED_LIBRARIES := liblog libdl libOmxCore
+LOCAL_SHARED_LIBRARIES	:= liblog libdl
 
 LOCAL_LDLIBS +=
 include $(BUILD_SHARED_LIBRARY)
diff --git a/msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/mm-video-v4l2/DivxDrmDecrypt/DivXDrmDecrypt.h b/msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/DivXDrmDecrypt.h
index d24c4dc..d24c4dc 100755
--- a/msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/mm-video-v4l2/DivxDrmDecrypt/DivXDrmDecrypt.h
+++ b/msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/DivXDrmDecrypt.h
diff --git a/msm8974/mm-video-v4l2/vidc/vdec.mk b/msm8974/mm-video-v4l2/vidc/vdec.mk
index 6e9f641..f6f2f24 100644
--- a/msm8974/mm-video-v4l2/vidc/vdec.mk
+++ b/msm8974/mm-video-v4l2/vidc/vdec.mk
@@ -97,8 +97,12 @@ LOCAL_PATH:= $(ROOT_DIR)
 
 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/mm-video-v4l2/DivxDrmDecrypt/
+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          += frameworks/native/include/media/hardware
 libmm-vdec-inc          += $(vdec-inc)
 libmm-vdec-inc      += hardware/qcom/media/msm8974/libc2dcolorconvert
@@ -113,7 +117,7 @@ LOCAL_C_INCLUDES                += $(libmm-vdec-inc)
 LOCAL_SHARED_LIBRARIES  := liblog libutils libbinder libcutils libdl
 
 LOCAL_SHARED_LIBRARIES  += libdivxdrmdecrypt
-LOCAL_SHARED_LIBRARIES  += libqdMetaData libstagefrighthw libOmxCore
+LOCAL_SHARED_LIBRARIES  += libqdMetaData
 
 LOCAL_SRC_FILES         := vdec/src/frameparser.cpp
 LOCAL_SRC_FILES         += vdec/src/h264_utils.cpp
@@ -124,7 +128,7 @@ ifneq ($(filter msm8974 msm8610 msm8226 msm8084 msm8952 msm8992 msm8994,$(TARGET
 LOCAL_SRC_FILES         += vdec/src/omx_vdec_msm8974.cpp
 else
 LOCAL_SHARED_LIBRARIES  += libhardware
-LOCAL_SHARED_LIBRARIES  += gralloc.$(TARGET_BOARD_PLATFORM) copybit.$(TARGET_BOARD_PLATFORM)
+libmm-vdec-inc          += $(TARGET_OUT_HEADERS)/qcom/display
 LOCAL_SRC_FILES         += vdec/src/power_module.cpp
 LOCAL_SRC_FILES         += vdec/src/omx_vdec.cpp
 endif
@@ -156,7 +160,6 @@ LOCAL_SHARED_LIBRARIES  := liblog libutils libbinder libcutils libdl
 
 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 50bd742..f019bc2 100644
--- a/msm8974/mm-video-v4l2/vidc/venc.mk
+++ b/msm8974/mm-video-v4l2/vidc/venc.mk
@@ -77,7 +77,12 @@ include $(CLEAR_VARS)
 
 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
@@ -89,8 +94,7 @@ LOCAL_CFLAGS                    := $(libmm-venc-def)
 LOCAL_C_INCLUDES                := $(libmm-venc-inc)
 
 LOCAL_SHARED_LIBRARIES    := liblog libutils libbinder libcutils \
-                             libc2dcolorconvert libdl libgui libOmxCore libstagefrighthw
-LOCAL_SHARED_LIBRARIES  += gralloc.$(TARGET_BOARD_PLATFORM) copybit.$(TARGET_BOARD_PLATFORM)
+                             libc2dcolorconvert libdl libgui
 
 LOCAL_SRC_FILES   := venc/src/omx_video_base.cpp
 LOCAL_SRC_FILES   += venc/src/omx_video_encoder.cpp