From 70497543958854162f385c4aaebf58b1151dfb50 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Fri, 3 Oct 2014 15:35:39 -0700 Subject: media: Use project pathmap Change-Id: I8d5d27fd6f23943f290aba5292114a3dfc2cc036 --- Android.mk | 2 +- libc2dcolorconvert/Android.mk | 14 ++++++-------- mm-video-legacy/vidc/vdec.mk | 16 ++++++---------- mm-video-legacy/vidc/venc.mk | 14 +++++--------- mm-video-v4l2/vidc/vdec.mk | 16 ++++++---------- mm-video-v4l2/vidc/venc.mk | 16 ++++++---------- 6 files changed, 30 insertions(+), 48 deletions(-) diff --git a/Android.mk b/Android.mk index ad55a98a..f244fafc 100644 --- a/Android.mk +++ b/Android.mk @@ -1,4 +1,4 @@ -ifeq ($(TARGET_QCOM_MEDIA_VARIANT),) +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/libc2dcolorconvert/Android.mk b/libc2dcolorconvert/Android.mk index 0d03c0ba..7c0c3eef 100644 --- a/libc2dcolorconvert/Android.mk +++ b/libc2dcolorconvert/Android.mk @@ -4,15 +4,13 @@ include $(CLEAR_VARS) ifneq ($(TARGET_QCOM_DISPLAY_VARIANT),) -DISPLAY := display-$(TARGET_QCOM_DISPLAY_VARIANT) +PLATFORM := . else -DISPLAY := display/$(TARGET_BOARD_PLATFORM) -# Fix the header inclusions for platform variants without an explicit path -ifneq ($(filter msm8610 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) - DISPLAY := display/msm8974 +ifneq ($(filter msm8610 msm8226 msm8974 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) +PLATFORM := msm8974 endif -ifneq ($(filter msm8660 ,$(TARGET_BOARD_PLATFORM)),) - DISPLAY := display/msm8960 +ifneq ($(filter msm8660 msm8960,$(TARGET_BOARD_PLATFORM)),) +PLATFORM := msm8960 endif endif @@ -22,7 +20,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(TOP)/frameworks/av/include/media/stagefright \ $(TOP)/frameworks/native/include/media/openmax \ - $(TOP)/hardware/qcom/$(DISPLAY)/libcopybit \ + $(TOP)/$(call project-path-for,qcom-display)/$(PLATFORM)/libcopybit \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr diff --git a/mm-video-legacy/vidc/vdec.mk b/mm-video-legacy/vidc/vdec.mk index 1fac244a..5d96646b 100644 --- a/mm-video-legacy/vidc/vdec.mk +++ b/mm-video-legacy/vidc/vdec.mk @@ -52,14 +52,10 @@ include $(CLEAR_VARS) LOCAL_PATH:= $(ROOT_DIR) ifneq ($(TARGET_QCOM_DISPLAY_VARIANT),) -DISPLAY := display-$(TARGET_QCOM_DISPLAY_VARIANT) +PLATFORM := . libOmxVdec-def += -DDISPLAYCAF else -DISPLAY := display/$(TARGET_BOARD_PLATFORM) -# Fix the header inclusions for platform variants without an explicit path -ifneq ($(filter msm8660 ,$(TARGET_BOARD_PLATFORM)),) - DISPLAY := display/msm8960 -endif +PLATFORM := msm8960 endif @@ -71,14 +67,14 @@ libmm-vdec-inc += hardware/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 += hardware/qcom/$(DISPLAY)/libgralloc +libmm-vdec-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libgralloc libmm-vdec-inc += frameworks/native/include/media/openmax libmm-vdec-inc += frameworks/native/include/media/hardware libmm-vdec-inc += hardware/qcom/media/libc2dcolorconvert -libmm-vdec-inc += hardware/qcom/$(DISPLAY)/libcopybit +libmm-vdec-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libcopybit libmm-vdec-inc += frameworks/av/include/media/stagefright -libmm-vdec-inc += hardware/qcom/$(DISPLAY)/libqservice -libmm-vdec-inc += hardware/qcom/$(DISPLAY)/libqdutils +libmm-vdec-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libqservice +libmm-vdec-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libqdutils libmm-vdec-inc += frameworks/av/media/libmediaplayerservice libmm-vdec-inc += frameworks/native/include/binder diff --git a/mm-video-legacy/vidc/venc.mk b/mm-video-legacy/vidc/venc.mk index 4cead195..b6c05680 100644 --- a/mm-video-legacy/vidc/venc.mk +++ b/mm-video-legacy/vidc/venc.mk @@ -43,13 +43,9 @@ libmm-venc-def += -D_ANDROID_ICS_ include $(CLEAR_VARS) ifneq ($(TARGET_QCOM_DISPLAY_VARIANT),) -DISPLAY := display-$(TARGET_QCOM_DISPLAY_VARIANT) +PLATFORM := . else -DISPLAY := display/$(TARGET_BOARD_PLATFORM) -# Fix the header inclusions for platform variants without an explicit path -ifneq ($(filter msm8660 ,$(TARGET_BOARD_PLATFORM)),) - DISPLAY := display/msm8960 -endif +PLATFORM := msm8960 endif @@ -60,11 +56,11 @@ libmm-venc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include 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 += hardware/qcom/$(DISPLAY)/libgralloc +libmm-venc-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libgralloc 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 += hardware/qcom/$(DISPLAY)/libcopybit +libmm-venc-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libcopybit libmm-venc-inc += frameworks/av/include/media/stagefright @@ -102,7 +98,7 @@ mm-venc-test720p-inc += $(LOCAL_PATH)/venc/inc mm-venc-test720p-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include mm-venc-test720p-inc += $(OMX_VIDEO_PATH)/vidc/common/inc mm-venc-test720p-inc += hardware/qcom/media/mm-core/inc -mm-venc-test720p-inc += hardware/qcom/$(DISPLAY)/libgralloc +mm-venc-test720p-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libgralloc LOCAL_MODULE := mm-venc-omx-test720p LOCAL_MODULE_TAGS := optional diff --git a/mm-video-v4l2/vidc/vdec.mk b/mm-video-v4l2/vidc/vdec.mk index 15496690..a80979c5 100644 --- a/mm-video-v4l2/vidc/vdec.mk +++ b/mm-video-v4l2/vidc/vdec.mk @@ -87,14 +87,10 @@ include $(CLEAR_VARS) LOCAL_PATH:= $(ROOT_DIR) ifneq ($(TARGET_QCOM_DISPLAY_VARIANT),) -DISPLAY := display-$(TARGET_QCOM_DISPLAY_VARIANT) +PLATFORM := . libOmxVdec-def += -DDISPLAYCAF else -DISPLAY := display/$(TARGET_BOARD_PLATFORM) -# Fix the header inclusions for platform variants without an explicit path -ifneq ($(filter msm8610 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) - DISPLAY := display/msm8974 -endif +PLATFORM := msm8974 endif libmm-vdec-inc := bionic/libc/include @@ -105,13 +101,13 @@ libmm-vdec-inc += hardware/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 += hardware/qcom/$(DISPLAY)/libgralloc +libmm-vdec-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/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 += hardware/qcom/$(DISPLAY)/libqdutils +libmm-vdec-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libqdutils libmm-vdec-inc += hardware/qcom/media/libc2dcolorconvert -libmm-vdec-inc += hardware/qcom/$(DISPLAY)/libcopybit +libmm-vdec-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libcopybit libmm-vdec-inc += frameworks/av/include/media/stagefright @@ -134,7 +130,7 @@ ifneq ($(filter msm8974 msm8610 msm8226 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM) LOCAL_SRC_FILES += vdec/src/omx_vdec_msm8974.cpp else LOCAL_SHARED_LIBRARIES += libhardware -libmm-vdec-inc += hardware/qcom/$(DISPLAY)/libhwcomposer +libmm-vdec-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libhwcomposer LOCAL_SRC_FILES += vdec/src/power_module.cpp LOCAL_SRC_FILES += vdec/src/omx_vdec.cpp endif diff --git a/mm-video-v4l2/vidc/venc.mk b/mm-video-v4l2/vidc/venc.mk index c846a0b3..88dffcde 100644 --- a/mm-video-v4l2/vidc/venc.mk +++ b/mm-video-v4l2/vidc/venc.mk @@ -76,13 +76,9 @@ libmm-venc-def += -D_ANDROID_ICS_ include $(CLEAR_VARS) ifneq ($(TARGET_QCOM_DISPLAY_VARIANT),) -DISPLAY := display-$(TARGET_QCOM_DISPLAY_VARIANT) +PLATFORM := . else -DISPLAY := display/$(TARGET_BOARD_PLATFORM) -# Fix the header inclusions for platform variants without an explicit path -ifneq ($(filter msm8610 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) - DISPLAY := display/msm8974 -endif +PLATFORM := msm8974 endif libmm-venc-inc := bionic/libc/include @@ -92,11 +88,11 @@ libmm-venc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include 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 += hardware/qcom/$(DISPLAY)/libgralloc +libmm-venc-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libgralloc 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 += hardware/qcom/$(DISPLAY)/libcopybit +libmm-venc-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libcopybit libmm-venc-inc += frameworks/av/include/media/stagefright libmm-venc-inc += frameworks/av/include/media/hardware libmm-venc-inc += $(venc-inc) @@ -133,7 +129,7 @@ mm-venc-test720p-inc += $(LOCAL_PATH)/venc/inc mm-venc-test720p-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include mm-venc-test720p-inc += $(OMX_VIDEO_PATH)/vidc/common/inc mm-venc-test720p-inc += hardware/qcom/media/mm-core/inc -mm-venc-test720p-inc += hardware/qcom/$(DISPLAY)/libgralloc +mm-venc-test720p-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libgralloc mm-venc-test720p-inc += $(venc-inc) LOCAL_MODULE := mm-venc-omx-test720p @@ -158,7 +154,7 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) venc-test-inc += $(LOCAL_PATH)/venc/inc -venc-test-inc += hardware/qcom/$(DISPLAY)/libgralloc +venc-test-inc += $(call project-path-for,qcom-display)/$(PLATFORM)/libgralloc venc-test-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include venc-test-inc += $(venc-inc) -- cgit v1.2.3