Skip to content

Commit 5038d53

Browse files
intervigiliumintervigilium
committed
media: Use direct project pathmap
Change-Id: Id402b96e531b4209508103b532732d2614ae9c64
1 parent 1055025 commit 5038d53

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ifeq ($(call my-dir),$(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM))
1+
ifeq ($(call my-dir),$(call project-path-for,qcom-media))
22

33
ifneq ($(filter msm8960,$(TARGET_BOARD_PLATFORM)),)
44

‎dashplayer/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ LOCAL_C_INCLUDES := \
4141
$(TOP)/frameworks/av/media/libstagefright/include \
4242
$(TOP)/frameworks/av/media/libstagefright/mpeg2ts \
4343
$(TOP)/frameworks/av/media/libstagefright/rtsp \
44-
$(TOP)/$(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc \
44+
$(TOP)/$(call project-path-for,qcom-media)/mm-core/inc \
4545

4646
#ifeq ($(PLATFORM_SDK_VERSION), 18)
4747
ifeq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 18 ))" )))

‎libc2dcolorconvert/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := \
88
LOCAL_C_INCLUDES := \
99
$(TOP)/frameworks/av/include/media/stagefright \
1010
$(TOP)/frameworks/native/include/media/openmax \
11-
$(TOP)/$(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libcopybit
11+
$(TOP)/$(call project-path-for,qcom-display)/libcopybit
1212
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
1313
LOCAL_SHARED_LIBRARIES := liblog libdl
1414

‎mm-video/vidc/vdec/Android.mk‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,20 @@ libmm-vdec-inc := bionic/libc/include
5555
libmm-vdec-inc += bionic/libstdc++/include
5656
libmm-vdec-inc += $(LOCAL_PATH)/inc
5757
libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
58-
libmm-vdec-inc += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
58+
libmm-vdec-inc += $(call project-path-for,qcom-media)/mm-core/inc
5959
libmm-vdec-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
6060
#DRM include - Interface which loads the DRM library
6161
libmm-vdec-inc += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc
62-
libmm-vdec-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libgralloc
62+
libmm-vdec-inc += $(call project-path-for,qcom-display)/libgralloc
6363
libmm-vdec-inc += frameworks/native/include/media/openmax
6464
libmm-vdec-inc += frameworks/native/include/media/hardware
65-
libmm-vdec-inc += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/libc2dcolorconvert
66-
libmm-vdec-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libcopybit
65+
libmm-vdec-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert
66+
libmm-vdec-inc += $(call project-path-for,qcom-display)/libcopybit
6767
libmm-vdec-inc += frameworks/av/include/media/stagefright
68-
libmm-vdec-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libqservice
68+
libmm-vdec-inc += $(call project-path-for,qcom-display)/libqservice
6969
libmm-vdec-inc += frameworks/av/media/libmediaplayerservice
7070
libmm-vdec-inc += frameworks/native/include/binder
71-
libmm-vdec-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libqdutils
71+
libmm-vdec-inc += $(call project-path-for,qcom-display)/libqdutils
7272

7373

7474
LOCAL_MODULE := libOmxVdec
@@ -100,7 +100,7 @@ include $(BUILD_SHARED_LIBRARY)
100100
# ---------------------------------------------------------------------------------
101101
include $(CLEAR_VARS)
102102

103-
mm-vdec-test-inc := $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
103+
mm-vdec-test-inc := $(call project-path-for,qcom-media)/mm-core/inc
104104
mm-vdec-test-inc += $(LOCAL_PATH)/inc
105105
mm-vdec-test-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
106106

@@ -124,7 +124,7 @@ include $(BUILD_EXECUTABLE)
124124
# ---------------------------------------------------------------------------------
125125
include $(CLEAR_VARS)
126126

127-
mm-vdec-drv-test-inc := $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
127+
mm-vdec-drv-test-inc := $(call project-path-for,qcom-media)/mm-core/inc
128128
mm-vdec-drv-test-inc += $(LOCAL_PATH)/inc
129129
mm-vdec-drv-test-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
130130

‎mm-video/vidc/venc/Android.mk‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ libmm-venc-inc := bionic/libc/include
4646
libmm-venc-inc += bionic/libstdc++/include
4747
libmm-venc-inc += $(LOCAL_PATH)/inc
4848
libmm-venc-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
49-
libmm-venc-inc += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
50-
libmm-venc-inc += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/libstagefrighthw
51-
libmm-venc-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libgralloc
49+
libmm-venc-inc += $(call project-path-for,qcom-media)/mm-core/inc
50+
libmm-venc-inc += $(call project-path-for,qcom-media)/libstagefrighthw
51+
libmm-venc-inc += $(call project-path-for,qcom-display)/libgralloc
5252
libmm-venc-inc += hardware/libhardware/include/hardware/
5353
libmm-venc-inc += frameworks/native/include/media/hardware
5454
libmm-venc-inc += frameworks/native/include/media/openmax
55-
libmm-venc-inc += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/libc2dcolorconvert
56-
libmm-venc-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libcopybit
55+
libmm-venc-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert
56+
libmm-venc-inc += $(call project-path-for,qcom-display)/libcopybit
5757
libmm-venc-inc += frameworks/av/include/media/stagefright
5858
libmm-venc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
5959

@@ -90,8 +90,8 @@ include $(CLEAR_VARS)
9090
mm-venc-test720p-inc := $(TARGET_OUT_HEADERS)/mm-core
9191
mm-venc-test720p-inc += $(LOCAL_PATH)/inc
9292
mm-venc-test720p-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
93-
mm-venc-test720p-inc += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
94-
mm-venc-test720p-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libgralloc
93+
mm-venc-test720p-inc += $(call project-path-for,qcom-media)/mm-core/inc
94+
mm-venc-test720p-inc += $(call project-path-for,qcom-display)/libgralloc
9595
mm-venc-test720p-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
9696

9797
LOCAL_MODULE := mm-venc-omx-test720p
@@ -121,7 +121,7 @@ venc-test-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/in
121121
LOCAL_MODULE := mm-video-encdrv-test
122122
LOCAL_MODULE_TAGS := debug
123123
LOCAL_C_INCLUDES := $(venc-test-inc)
124-
LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
124+
LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/mm-core/inc
125125
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
126126
LOCAL_PRELINK_MODULE := false
127127

0 commit comments

Comments
 (0)