diff options
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | mm-core/Android.mk | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/common/Android.mk | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 14 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 12 |
5 files changed, 21 insertions, 17 deletions
@@ -1,3 +1,5 @@ +ifeq ($(call my-dir),$(call project-path-for,qcom-media)) + QCOM_MEDIA_ROOT := $(call my-dir) #Compile these for all targets under QCOM_BOARD_PLATFORMS list. @@ -15,3 +17,5 @@ ifeq ($(ENABLE_HYP),true) include $(QCOM_MEDIA_ROOT)/hypv-intercept/Android.mk endif endif + +endif diff --git a/mm-core/Android.mk b/mm-core/Android.mk index a3f2b1e0..b0d06372 100644 --- a/mm-core/Android.mk +++ b/mm-core/Android.mk @@ -66,7 +66,7 @@ LOCAL_COPY_HEADERS += inc/QCMetaData.h #=============================================================================== LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/common -LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/media/libplatformconfig +LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/libplatformconfig LOCAL_HEADER_LIBRARIES := \ libutils_headers \ @@ -101,7 +101,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/common -LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/media/libplatformconfig +LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/libplatformconfig LOCAL_HEADER_LIBRARIES := \ libutils_headers \ diff --git a/mm-video-v4l2/vidc/common/Android.mk b/mm-video-v4l2/vidc/common/Android.mk index c282cfb9..4361c93c 100644 --- a/mm-video-v4l2/vidc/common/Android.mk +++ b/mm-video-v4l2/vidc/common/Android.mk @@ -21,8 +21,8 @@ libmm-vidc-def += -D_ANDROID_ICS_ # --------------------------------------------------------------------------------- libmm-vidc-inc := $(LOCAL_PATH)/inc -libmm-vidc-inc += $(TOP)/hardware/qcom/media/mm-core/inc -libmm-vidc-inc += $(TOP)/hardware/qcom/media/libc2dcolorconvert +libmm-vidc-inc += $(call project-path-for,qcom-media)/mm-core/inc +libmm-vidc-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert libmm-vidc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include libmm-vidc-inc += $(TOP)/hardware/libhardware/include libmm-vidc-inc += $(LIBION_HEADER_PATHS) diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index 89035384..ba54062c 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -58,19 +58,19 @@ include $(CLEAR_VARS) # Common Includes libmm-vdec-inc := $(LOCAL_PATH)/inc libmm-vdec-inc += $(LIBION_HEADER_PATHS) -libmm-vdec-inc += $(TOP)/hardware/qcom/media/mm-video-v4l2/vidc/common/inc -libmm-vdec-inc += $(TOP)/hardware/qcom/media/mm-core/inc -libmm-vdec-inc += hardware/qcom/media/libplatformconfig +libmm-vdec-inc += $(call project-path-for,qcom-media)/mm-video-v4l2/vidc/common/inc +libmm-vdec-inc += $(call project-path-for,qcom-media)/mm-core/inc +libmm-vdec-inc += $(call project-path-for,qcom-media)/libplatformconfig libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno -libmm-vdec-inc += $(TOP)/hardware/qcom/media/libc2dcolorconvert +libmm-vdec-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/SwVdec libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/swvdec libmm-vdec-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include -libmm-vdec-inc += $(TOP)/hardware/qcom/media/libarbitrarybytes/inc +libmm-vdec-inc += $(call project-path-for,qcom-media)/libarbitrarybytes/inc ifeq ($(PLATFORM_SDK_VERSION), 18) #JB_MR2 libmm-vdec-def += -DANDROID_JELLYBEAN_MR2=1 -libmm-vdec-inc += $(TOP)/hardware/qcom/media/libstagefrighthw +libmm-vdec-inc += $(call project-path-for,qcom-media)/libstagefrighthw endif # Common Dependencies @@ -90,7 +90,7 @@ libmm-vdec-def += -DALLOCATE_OUTPUT_NATIVEHANDLE ifeq ($(ENABLE_HYP),true) libmm-vdec-def += -DHYPERVISOR -libmm-vdec-inc += $(TOP)/hardware/qcom/media/hypv-intercept +libmm-vdec-inc += $(call project-path-for,qcom-media)/hypv-intercept endif # --------------------------------------------------------------------------------- # Make the Shared library (libOmxVdec) diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index aea70b2b..1a2b13d4 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -66,12 +66,12 @@ endif # Common Includes libmm-venc-inc := $(LOCAL_PATH)/inc libmm-venc-inc += $(LIBION_HEADER_PATHS) -libmm-venc-inc += $(TOP)/hardware/qcom/media/mm-video-v4l2/vidc/common/inc -libmm-venc-inc += hardware/qcom/media/mm-core/inc -libmm-venc-inc += hardware/qcom/media/libstagefrighthw -libmm-venc-inc += hardware/qcom/media/libplatformconfig +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 += $(call project-path-for,qcom-media)/libplatformconfig libmm-venc-inc += $(TARGET_OUT_HEADERS)/adreno -libmm-venc-inc += hardware/qcom/media/libc2dcolorconvert +libmm-venc-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert libmm-venc-inc += $(TARGET_OUT_HEADERS)/libvqzip libmm-venc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include libmm-venc-inc += $(TOP)/frameworks/native/libs/nativewindow/include @@ -79,7 +79,7 @@ libmm-venc-inc += $(TOP)/frameworks/native/libs/nativebase/include libmm-venc-inc += $(TOP)/frameworks/native/libs/arect/include ifeq ($(ENABLE_HYP),true) -libmm-venc-inc += hardware/qcom/media/hypv-intercept +libmm-venc-inc += $(call project-path-for,qcom-media)/hypv-intercept endif ifneq ($(call is-board-platform-in-list, $(TARGETS_THAT_DONT_SUPPORT_SW_VENC_ROTATION)),true) |