diff options
| author | Ethan Chen <intervigil@gmail.com> | 2014-11-18 14:13:25 -0800 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2014-11-18 14:15:43 -0800 |
| commit | 5038d532daa4b4dd39c9a28f38a07c2326742c05 (patch) | |
| tree | 463ae5507eee842d12522b228501645aa4558cc8 | |
| parent | 1055025fe4e48ce6cf305881a48191d7cfeb1909 (diff) | |
| download | android_hardware_qcom_media-5038d532daa4b4dd39c9a28f38a07c2326742c05.tar.gz android_hardware_qcom_media-5038d532daa4b4dd39c9a28f38a07c2326742c05.tar.bz2 android_hardware_qcom_media-5038d532daa4b4dd39c9a28f38a07c2326742c05.zip | |
media: Use direct project pathmap
Change-Id: Id402b96e531b4209508103b532732d2614ae9c64
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | dashplayer/Android.mk | 2 | ||||
| -rw-r--r-- | libc2dcolorconvert/Android.mk | 2 | ||||
| -rw-r--r-- | mm-video/vidc/vdec/Android.mk | 16 | ||||
| -rw-r--r-- | mm-video/vidc/venc/Android.mk | 16 |
5 files changed, 19 insertions, 19 deletions
@@ -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)) ifneq ($(filter msm8960,$(TARGET_BOARD_PLATFORM)),) diff --git a/dashplayer/Android.mk b/dashplayer/Android.mk index 7b4c8828..1dca1af2 100644 --- a/dashplayer/Android.mk +++ b/dashplayer/Android.mk @@ -41,7 +41,7 @@ LOCAL_C_INCLUDES := \ $(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-media)/mm-core/inc \ #ifeq ($(PLATFORM_SDK_VERSION), 18) ifeq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 18 ))" ))) diff --git a/libc2dcolorconvert/Android.mk b/libc2dcolorconvert/Android.mk index 863bf214..56bc576f 100644 --- a/libc2dcolorconvert/Android.mk +++ b/libc2dcolorconvert/Android.mk @@ -8,7 +8,7 @@ LOCAL_SRC_FILES := \ 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 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_SHARED_LIBRARIES := liblog libdl diff --git a/mm-video/vidc/vdec/Android.mk b/mm-video/vidc/vdec/Android.mk index 4cfbabfb..eedcf889 100644 --- a/mm-video/vidc/vdec/Android.mk +++ b/mm-video/vidc/vdec/Android.mk @@ -55,20 +55,20 @@ libmm-vdec-inc := bionic/libc/include 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 libmm-vdec-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include #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 += $(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-media)/libc2dcolorconvert +libmm-vdec-inc += $(call project-path-for,qcom-display)/libcopybit libmm-vdec-inc += frameworks/av/include/media/stagefright -libmm-vdec-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libqservice +libmm-vdec-inc += $(call project-path-for,qcom-display)/libqservice libmm-vdec-inc += frameworks/av/media/libmediaplayerservice libmm-vdec-inc += frameworks/native/include/binder -libmm-vdec-inc += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libqdutils +libmm-vdec-inc += $(call project-path-for,qcom-display)/libqdutils LOCAL_MODULE := libOmxVdec @@ -100,7 +100,7 @@ include $(BUILD_SHARED_LIBRARY) # --------------------------------------------------------------------------------- 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 += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include @@ -124,7 +124,7 @@ include $(BUILD_EXECUTABLE) # --------------------------------------------------------------------------------- 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 += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include diff --git a/mm-video/vidc/venc/Android.mk b/mm-video/vidc/venc/Android.mk index 47d80b94..f4c77fd7 100644 --- a/mm-video/vidc/venc/Android.mk +++ b/mm-video/vidc/venc/Android.mk @@ -46,14 +46,14 @@ libmm-venc-inc := bionic/libc/include 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 += hardware/libhardware/include/hardware/ 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_INTERMEDIATES)/KERNEL_OBJ/usr/include @@ -90,8 +90,8 @@ include $(CLEAR_VARS) 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 += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_MODULE := mm-venc-omx-test720p @@ -121,7 +121,7 @@ venc-test-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/in LOCAL_MODULE := mm-video-encdrv-test LOCAL_MODULE_TAGS := debug 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 |