Merge remote-tracking branch 'caf/LA.BR.1.3.7_rb1.6' into lineage-15.0-caf-8952
Change-Id: If2fafc23b7a0322200eadf0422b19466f60fb54e
diff --git a/Android.mk b/Android.mk
index 081b94a..ffff416 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,5 @@
+ifeq ($(call my-dir),$(call project-path-for,qcom-media))
+
QCOM_MEDIA_ROOT := $(call my-dir)
$(warning target list is : $(MSM_VIDC_TARGET_LIST))
@@ -10,5 +12,6 @@
ifeq ($(call is-board-platform-in-list, $(MSM_VIDC_TARGET_LIST)),true)
include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk
include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk
+endif
endif
diff --git a/mm-video-v4l2/vidc/common/Android.mk b/mm-video-v4l2/vidc/common/Android.mk
index 3b28f45..e1686e6 100644
--- a/mm-video-v4l2/vidc/common/Android.mk
+++ b/mm-video-v4l2/vidc/common/Android.mk
@@ -21,9 +21,9 @@
# ---------------------------------------------------------------------------------
libmm-vidc-inc := $(LOCAL_PATH)/inc
-libmm-vidc-inc += $(TOP)/hardware/qcom/media/mm-core/inc
+libmm-vidc-inc += $(TOP)/$(call project-path-for,qcom-media)/mm-core/inc
libmm-vidc-inc += $(TARGET_OUT_HEADERS)/qcom/display
-libmm-vidc-inc += $(TOP)/hardware/qcom/media/libc2dcolorconvert
+libmm-vidc-inc += $(TOP)/$(call project-path-for,qcom-media)/libc2dcolorconvert
libmm-vidc-inc += $(TOP)/frameworks/av/include/media/stagefright
libmm-vidc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index 885a851..640d8c9 100644
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -57,19 +57,19 @@
# Common Includes
libmm-vdec-inc := $(LOCAL_PATH)/inc
libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
-libmm-vdec-inc += $(TOP)/hardware/qcom/media/mm-core/inc
+libmm-vdec-inc += $(TOP)/$(call project-path-for,qcom-media)/mm-core/inc
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno
libmm-vdec-inc += $(TOP)/frameworks/native/include/media/openmax
libmm-vdec-inc += $(TOP)/frameworks/native/include/media/hardware
-libmm-vdec-inc += $(TOP)/hardware/qcom/media/libc2dcolorconvert
+libmm-vdec-inc += $(TOP)/$(call project-path-for,qcom-media)/libc2dcolorconvert
libmm-vdec-inc += $(TOP)/frameworks/av/include/media/stagefright
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/SwVdec
libmm-vdec-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
ifeq ($(PLATFORM_SDK_VERSION), 18) #JB_MR2
libmm-vdec-def += -DANDROID_JELLYBEAN_MR2=1
-libmm-vdec-inc += $(TOP)/hardware/qcom/media/libstagefrighthw
+libmm-vdec-inc += $(TOP)/$(call project-path-for,qcom-media)/libstagefrighthw
endif
# Common Dependencies
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index 7bb1aa6..3b9a6fb 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -57,13 +57,13 @@
# Common Includes
libmm-venc-inc := $(LOCAL_PATH)/inc
libmm-venc-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
-libmm-venc-inc += hardware/qcom/media/mm-core/inc
-libmm-venc-inc += hardware/qcom/media/libstagefrighthw
+libmm-venc-inc += $(call project-path-for,qcom-media)/mm-core/inc
+libmm-venc-inc += $(call project-path-for,qcom-media)/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/libc2dcolorconvert
+libmm-venc-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert
libmm-venc-inc += frameworks/av/include/media/stagefright
libmm-venc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include