Skip to content

Commit

Permalink
media: Use project pathmap
Browse files Browse the repository at this point in the history 
Change-Id: I7f18f9af0eac23baba2559b40dcddbc1081e91f5
  • Loading branch information
@intervigilium
intervigilium committed Nov 21, 2016
1 parent 3516553 commit 4b826f7
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 27 deletions.
4 changes: 4 additions & 0 deletions Android.mk
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ifeq ($(call my-dir)/$(TARGET_BOARD_PLATFORM),$(call project-path-for,qcom-media))

# TODO: Find a better way to separate build configs for ADP vs non-ADP devices
ifneq ($(TARGET_BOARD_AUTO),true)
# for msm8996 targets, use the msm8996 directory, for all other targets
Expand Down Expand Up @@ -25,3 +27,5 @@ ifneq ($(TARGET_BOARD_AUTO),true)
include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk
endif
endif

endif
1 change: 1 addition & 0 deletions msm8960
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msm8974
8 changes: 4 additions & 4 deletions msm8974/mm-video-legacy/vidc/vdec.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ LOCAL_PATH:= $(ROOT_DIR)

libmm-vdec-inc := $(LOCAL_PATH)/vdec/inc
libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
libmm-vdec-inc += hardware/qcom/media/msm8974/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 += $(TARGET_OUT_HEADERS)/qcom/display
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno200
libmm-vdec-inc += frameworks/native/include/media/openmax
libmm-vdec-inc += frameworks/native/include/media/hardware
libmm-vdec-inc += hardware/qcom/media/msm8974/libc2dcolorconvert
libmm-vdec-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert
libmm-vdec-inc += frameworks/av/include/media/stagefright
libmm-vdec-inc += $(vdec-inc)

Expand Down Expand Up @@ -95,7 +95,7 @@ include $(BUILD_SHARED_LIBRARY)
# ---------------------------------------------------------------------------------
include $(CLEAR_VARS)

mm-vdec-test-inc := hardware/qcom/media/msm8974/mm-core/inc
mm-vdec-test-inc := $(call project-path-for,qcom-media)/mm-core/inc
mm-vdec-test-inc += $(LOCAL_PATH)/vdec/inc
mm-vdec-test-inc += $(vdec-inc)

Expand All @@ -118,7 +118,7 @@ include $(BUILD_EXECUTABLE)
# ---------------------------------------------------------------------------------
include $(CLEAR_VARS)

mm-vdec-drv-test-inc := hardware/qcom/media/msm8974/mm-core/inc
mm-vdec-drv-test-inc := $(call project-path-for,qcom-media)/mm-core/inc
mm-vdec-drv-test-inc += $(LOCAL_PATH)/vdec/inc
mm-vdec-drv-test-inc += $(vdec-inc)

Expand Down
10 changes: 5 additions & 5 deletions msm8974/mm-video-legacy/vidc/venc.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ include $(CLEAR_VARS)

libmm-venc-inc := $(LOCAL_PATH)/venc/inc
libmm-venc-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
libmm-venc-inc += hardware/qcom/media/msm8974/mm-core/inc
libmm-venc-inc += hardware/qcom/media/msm8974/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 += $(TARGET_OUT_HEADERS)/adreno200
libmm-venc-inc += frameworks/native/include/media/hardware
libmm-venc-inc += frameworks/native/include/media/openmax
libmm-venc-inc += hardware/qcom/media/msm8974/libc2dcolorconvert
libmm-venc-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert
libmm-venc-inc += frameworks/av/include/media/stagefright
libmm-venc-inc += $(venc-inc)

Expand Down Expand Up @@ -89,7 +89,7 @@ include $(CLEAR_VARS)
mm-venc-test720p-inc := $(TARGET_OUT_HEADERS)/mm-core
mm-venc-test720p-inc += $(LOCAL_PATH)/venc/inc
mm-venc-test720p-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
mm-venc-test720p-inc += hardware/qcom/media/msm8974/mm-core/inc
mm-venc-test720p-inc += $(call project-path-for,qcom-media)/mm-core/inc
mm-venc-test720p-inc += $(TARGET_OUT_HEADERS)/qcom/display
mm-venc-test720p-inc += $(venc-inc)

Expand Down Expand Up @@ -120,7 +120,7 @@ venc-test-inc += $(venc-inc)
LOCAL_MODULE := mm-video-encdrv-test
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(venc-test-inc)
LOCAL_C_INCLUDES += hardware/qcom/media/msm8974/mm-core/inc
LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/mm-core/inc


LOCAL_SRC_FILES := venc/test/video_encoder_test.c
Expand Down
8 changes: 4 additions & 4 deletions msm8974/mm-video-v4l2/vidc/vdec.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ LOCAL_PATH:= $(ROOT_DIR)

libmm-vdec-inc := $(LOCAL_PATH)/vdec/inc
libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
libmm-vdec-inc += hardware/qcom/media/msm8974/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 += $(TARGET_OUT_HEADERS)/qcom/display
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno
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/media/msm8974/libc2dcolorconvert
libmm-vdec-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert
libmm-vdec-inc += frameworks/av/include/media/stagefright


Expand Down Expand Up @@ -187,7 +187,7 @@ endif
# ---------------------------------------------------------------------------------
include $(CLEAR_VARS)

mm-vdec-test-inc := hardware/qcom/media/msm8974/mm-core/inc
mm-vdec-test-inc := $(call project-path-for,qcom-media)/mm-core/inc
mm-vdec-test-inc += $(LOCAL_PATH)/vdec/inc
mm-vdec-test-inc += $(vdec-inc)

Expand All @@ -208,7 +208,7 @@ LOCAL_SRC_FILES += vdec/test/omx_vdec_test.cpp
# ---------------------------------------------------------------------------------
include $(CLEAR_VARS)

mm-vdec-drv-test-inc := hardware/qcom/media/msm8974/mm-core/inc
mm-vdec-drv-test-inc := $(call project-path-for,qcom-media)/mm-core/inc
mm-vdec-drv-test-inc += $(LOCAL_PATH)/vdec/inc
mm-vdec-drv-test-inc += $(vdec-inc)

Expand Down
6 changes: 3 additions & 3 deletions msm8974/mm-video-v4l2/vidc/venc.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ include $(CLEAR_VARS)

libmm-venc-inc := $(LOCAL_PATH)/venc/inc
libmm-venc-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
libmm-venc-inc += hardware/qcom/media/msm8974/mm-core/inc
libmm-venc-inc += hardware/qcom/media/msm8974/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/msm8974/libc2dcolorconvert
libmm-venc-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert
libmm-venc-inc += frameworks/av/include/media/stagefright
libmm-venc-inc += frameworks/av/include/media/hardware
libmm-venc-inc += $(venc-inc)
Expand Down
4 changes: 2 additions & 2 deletions msm8996/mm-video-v4l2/vidc/common/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ libmm-vidc-def += -D_ANDROID_ICS_
# ---------------------------------------------------------------------------------

libmm-vidc-inc := $(LOCAL_PATH)/inc
libmm-vidc-inc += $(TOP)/hardware/qcom/media/msm8996/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/msm8996/libc2dcolorconvert
libmm-vidc-inc += $(TOP)/$(call project-path-for,qcom-media)/libc2dcolorconvert
libmm-vidc-inc += $(TOP)/frameworks/av/include/media/stagefright
ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
libmm-vidc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
Expand Down
8 changes: 4 additions & 4 deletions msm8996/mm-video-v4l2/vidc/vdec/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ include $(CLEAR_VARS)

# Common Includes
libmm-vdec-inc := $(LOCAL_PATH)/inc
libmm-vdec-inc += $(TOP)/hardware/qcom/media/msm8996/mm-video-v4l2/vidc/common/inc
libmm-vdec-inc += $(TOP)/hardware/qcom/media/msm8996/mm-core/inc
libmm-vdec-inc += $(TOP)/$(call project-path-for,qcom-media)/mm-video-v4l2/vidc/common/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/msm8996/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_HEADERS)/mm-video/swvdec
Expand All @@ -82,7 +82,7 @@ endif

ifeq ($(PLATFORM_SDK_VERSION), 18) #JB_MR2
libmm-vdec-def += -DANDROID_JELLYBEAN_MR2=1
libmm-vdec-inc += $(TOP)/hardware/qcom/media/msm8996/libstagefrighthw
libmm-vdec-inc += $(TOP)/$(call project-path-for,qcom-media)/libstagefrighthw
endif

# Common Dependencies
Expand Down
8 changes: 4 additions & 4 deletions msm8996/mm-video-v4l2/vidc/venc/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ endif

# Common Includes
libmm-venc-inc := $(LOCAL_PATH)/inc
libmm-venc-inc += $(TOP)/hardware/qcom/media/msm8996/mm-video-v4l2/vidc/common/inc
libmm-venc-inc += hardware/qcom/media/msm8996/mm-core/inc
libmm-venc-inc += hardware/qcom/media/msm8996/libstagefrighthw
libmm-venc-inc += $(call project-path-for,qcom-media)/mm-video-v4l2/vidc/common/inc
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/msm8996/libc2dcolorconvert
libmm-venc-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert
libmm-venc-inc += $(TARGET_OUT_HEADERS)/libvqzip
libmm-venc-inc += frameworks/av/include/media/stagefright
ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
Expand Down
2 changes: 1 addition & 1 deletion msm8996/videopp/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ LOCAL_PATH:= $(ROOT_DIR)

libmm-vidpp-inc += $(LOCAL_PATH)/inc
libmm-vidpp-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
libmm-vidpp-inc += hardware/qcom/media/msm8996/mm-core/inc
libmm-vidpp-inc += $(call project-path-for,qcom-media)/msm8996/mm-core/inc
libmm-vidpp-inc += $(TARGET_OUT_HEADERS)/qcom/display
libmm-vidpp-inc += frameworks/native/include/media/openmax
libmm-vidpp-inc += frameworks/native/include/media/hardware
Expand Down

0 comments on commit 4b826f7

Please sign in to comment.