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 | 6 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 10 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 10 |
5 files changed, 15 insertions, 19 deletions
@@ -1,5 +1,3 @@ -ifeq ($(call my-dir),$(call project-path-for,qcom-media)) - QCOM_MEDIA_ROOT := $(call my-dir) VIDC_STUB_HAL := false @@ -23,5 +21,3 @@ include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk include $(QCOM_MEDIA_ROOT)/media-prop/Android.mk endif #VIDC_STUB_HAL endif - -endif diff --git a/mm-core/Android.mk b/mm-core/Android.mk index 2b044a37..e2197896 100644 --- a/mm-core/Android.mk +++ b/mm-core/Android.mk @@ -38,7 +38,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 \ @@ -83,7 +83,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 652a328c..fd313ef6 100644 --- a/mm-video-v4l2/vidc/common/Android.mk +++ b/mm-video-v4l2/vidc/common/Android.mk @@ -25,9 +25,9 @@ endif # --------------------------------------------------------------------------------- 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)/mm-video-v4l2/vidc/vdec/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/mm-video-v4l2/vidc/vdec/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 += $(TOP)/frameworks/native/headers/media_plugin diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index 0d809482..533c6ea4 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -63,11 +63,11 @@ 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 @@ -75,7 +75,7 @@ libmm-vdec-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include 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 diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index 106cd7e9..ab838a69 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -57,12 +57,12 @@ libmm-venc-def += -DUSE_CAMERA_METABUFFER_UTILS # 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_INTERMEDIATES)/KERNEL_OBJ/usr/include libmm-venc-inc += $(TOP)/frameworks/native/libs/nativewindow/include libmm-venc-inc += $(TOP)/frameworks/native/libs/nativebase/include |