media: Use direct project pathmap
Change-Id: Ib016ef11da0abab60fa43830586d3787c3a6d48e
diff --git a/Android.mk b/Android.mk
index 6b1e3e2..2c1137e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(call my-dir),$(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM))
+ifeq ($(call my-dir),$(call project-path-for,qcom-media))
QCOM_MEDIA_ROOT := $(call my-dir)
ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),)
diff --git a/dashplayer/Android.mk b/dashplayer/Android.mk
index 09f9577..acf9a7a 100644
--- a/dashplayer/Android.mk
+++ b/dashplayer/Android.mk
@@ -36,8 +36,8 @@
$(TOP)/frameworks/av/media/libstagefright/include \
$(TOP)/frameworks/av/media/libstagefright/mpeg2ts \
$(TOP)/frameworks/av/media/libstagefright/rtsp \
- $(TOP)/$(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc \
- $(TOP)/$(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libgralloc \
+ $(TOP)/$(call project-path-for,qcom-media)/mm-core/inc \
+ $(TOP)/$(call project-path-for,qcom-display)/libgralloc \
$(LOCAL_PATH)/../QCMediaPlayer/native \
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
diff --git a/libc2dcolorconvert/Android.mk b/libc2dcolorconvert/Android.mk
index 778c1b4..53cebe0 100644
--- a/libc2dcolorconvert/Android.mk
+++ b/libc2dcolorconvert/Android.mk
@@ -8,7 +8,7 @@
LOCAL_C_INCLUDES := \
$(TOP)/frameworks/av/include/media/stagefright \
$(TOP)/frameworks/native/include/media/openmax \
- $(TOP)/$(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libcopybit \
+ $(TOP)/$(call project-path-for,qcom-display)/libcopybit \
$(TARGET_OUT_HEADERS)/qcom/display/
LOCAL_C_INCLUDES += $(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 5ef03ff..ff92e6b 100755
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -102,23 +102,23 @@
libmm-vdec-inc += bionic/libstdc++/include
libmm-vdec-inc += $(LOCAL_PATH)/inc
libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
-libmm-vdec-inc += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
+libmm-vdec-inc += $(call project-path-for,qcom-media)/mm-core/inc
#DRM include - Interface which loads the DRM library
libmm-vdec-inc += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc
-libmm-vdec-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libgralloc
+libmm-vdec-inc += $(call project-path-for,qcom-display)/libgralloc
libmm-vdec-inc += frameworks/native/include/media/openmax
libmm-vdec-inc += frameworks/native/include/media/hardware
libmm-vdec-inc += $(vdec-inc)
-libmm-vdec-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libqdutils
-libmm-vdec-inc += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/libc2dcolorconvert
-libmm-vdec-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libcopybit
+libmm-vdec-inc += $(call project-path-for,qcom-display)/libqdutils
+libmm-vdec-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert
+libmm-vdec-inc += $(call project-path-for,qcom-display)/libcopybit
libmm-vdec-inc += frameworks/av/include/media/stagefright
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/SwVdec
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display/
ifneq ($(call is-platform-sdk-version-at-least, 19),true)
libOmxVdec-def += -DMETADATA_FOR_DYNAMIC_MODE
-libmm-vdec-inc += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/libstagefrighthw
+libmm-vdec-inc += $(call project-path-for,qcom-media)/libstagefrighthw
endif
ifeq ($(call is-platform-sdk-version-at-least, 19),true)
@@ -145,7 +145,7 @@
LOCAL_SRC_FILES += src/omx_vdec_msm8974.cpp
else
LOCAL_SHARED_LIBRARIES += libhardware
-libmm-vdec-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libhwcomposer
+libmm-vdec-inc += $(call project-path-for,qcom-display)/libhwcomposer
LOCAL_SRC_FILES += src/power_module.cpp
LOCAL_SRC_FILES += src/omx_vdec.cpp
endif
@@ -208,7 +208,7 @@
# ---------------------------------------------------------------------------------
include $(CLEAR_VARS)
-mm-vdec-test-inc := $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
+mm-vdec-test-inc := $(call project-path-for,qcom-media)/mm-core/inc
mm-vdec-test-inc += $(LOCAL_PATH)/inc
mm-vdec-test-inc += $(vdec-inc)
@@ -231,7 +231,7 @@
# ---------------------------------------------------------------------------------
include $(CLEAR_VARS)
-mm-vdec-drv-test-inc := $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
+mm-vdec-drv-test-inc := $(call project-path-for,qcom-media)/mm-core/inc
mm-vdec-drv-test-inc += $(LOCAL_PATH)/inc
mm-vdec-drv-test-inc += $(vdec-inc)
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index 64208e3..94642a6 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -81,13 +81,13 @@
libmm-venc-inc += bionic/libstdc++/include
libmm-venc-inc += $(LOCAL_PATH)/inc
libmm-venc-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
-libmm-venc-inc += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
-libmm-venc-inc += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/libstagefrighthw
-libmm-venc-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libgralloc
+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 += $(call project-path-for,qcom-display)/libgralloc
libmm-venc-inc += frameworks/native/include/media/hardware
libmm-venc-inc += frameworks/native/include/media/openmax
-libmm-venc-inc += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/libc2dcolorconvert
-libmm-venc-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libcopybit
+libmm-venc-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert
+libmm-venc-inc += $(call project-path-for,qcom-display)/libcopybit
libmm-venc-inc += frameworks/av/include/media/stagefright
libmm-venc-inc += $(TARGET_OUT_HEADERS)/qcom/display/
libmm-venc-inc += $(venc-inc)
@@ -124,8 +124,8 @@
mm-venc-test720p-inc := $(TARGET_OUT_HEADERS)/mm-core
mm-venc-test720p-inc += $(LOCAL_PATH)/inc
mm-venc-test720p-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
-mm-venc-test720p-inc += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
-mm-venc-test720p-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libgralloc
+mm-venc-test720p-inc += $(call project-path-for,qcom-media)/mm-core/inc
+mm-venc-test720p-inc += $(call project-path-for,qcom-display)/libgralloc
mm-venc-test720p-inc += $(venc-inc)
LOCAL_MODULE := mm-venc-omx-test720p
@@ -150,13 +150,13 @@
include $(CLEAR_VARS)
venc-test-inc += $(LOCAL_PATH)/inc
-venc-test-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libgralloc
+venc-test-inc += $(call project-path-for,qcom-display)/libgralloc
venc-test-inc += $(venc-inc)
LOCAL_MODULE := mm-video-encdrv-test
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(venc-test-inc)
-LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
+LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/mm-core/inc
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_PRELINK_MODULE := false