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, 17 insertions, 21 deletions
@@ -1,5 +1,3 @@ -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. @@ -17,5 +15,3 @@ 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 66c0f9cb..b325d094 100644 --- a/mm-core/Android.mk +++ b/mm-core/Android.mk @@ -33,7 +33,7 @@ endif #=============================================================================== LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/common -LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/libplatformconfig +LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/media/libplatformconfig LOCAL_HEADER_LIBRARIES := \ libutils_headers \ @@ -68,7 +68,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/common -LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/libplatformconfig +LOCAL_C_INCLUDES += $(TOP)/hardware/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 4361c93c..c282cfb9 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 += $(call project-path-for,qcom-media)/mm-core/inc -libmm-vidc-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert +libmm-vidc-inc += $(TOP)/hardware/qcom/media/mm-core/inc +libmm-vidc-inc += $(TOP)/hardware/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 b7a3163f..fc3d4942 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 += $(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 += $(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 += $(TARGET_OUT_HEADERS)/adreno -libmm-vdec-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert +libmm-vdec-inc += $(TOP)/hardware/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 += $(call project-path-for,qcom-media)/libarbitrarybytes/inc +libmm-vdec-inc += $(TOP)/hardware/qcom/media/libarbitrarybytes/inc ifeq ($(PLATFORM_SDK_VERSION), 18) #JB_MR2 libmm-vdec-def += -DANDROID_JELLYBEAN_MR2=1 -libmm-vdec-inc += $(call project-path-for,qcom-media)/libstagefrighthw +libmm-vdec-inc += $(TOP)/hardware/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 += $(call project-path-for,qcom-media)/hypv-intercept +libmm-vdec-inc += $(TOP)/hardware/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 3e3e97fd..95fe6e92 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -70,12 +70,12 @@ endif # Common Includes libmm-venc-inc := $(LOCAL_PATH)/inc libmm-venc-inc += $(LIBION_HEADER_PATHS) -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 += $(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 += $(TARGET_OUT_HEADERS)/adreno -libmm-venc-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert +libmm-venc-inc += hardware/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 @@ -83,7 +83,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 += $(call project-path-for,qcom-media)/hypv-intercept +libmm-venc-inc += hardware/qcom/media/hypv-intercept endif ifneq ($(call is-board-platform-in-list, $(TARGETS_THAT_DONT_SUPPORT_SW_VENC_ROTATION)),true) |