diff options
| author | Deva Ramasubramanian <dramasub@codeaurora.org> | 2014-12-05 17:47:47 -0800 |
|---|---|---|
| committer | Deva Ramasubramanian <dramasub@codeaurora.org> | 2015-03-04 12:28:05 -0800 |
| commit | deb9944bf5c1d5ee65a44e334b15612de8b54233 (patch) | |
| tree | 635cbe07096422d098349a6466a6e667da7bff77 | |
| parent | 79696455c0066fb3c2ffaca90baa241bb12fd4b7 (diff) | |
| download | media-deb9944bf5c1d5ee65a44e334b15612de8b54233.tar.gz | |
mm-video: vidc: Get rid of OMX_VIDEO_PATH in make files
OMX_VIDEO_PATH is only defined at the top level makefile in
hardware/qcom/media/mm-video-v4l2. As a result, if you run 'mm' at the
lower levels (i.e. in src/) the compilation fails, because the top level
makefile is never executed and OMX_VIDEO_PATH := "" in the lower level
makefile. Hence, some header files are never found, e.g.:
hardware/qcom/media/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h:103:32: fatal
error: extra_data_handler.h: No such file or directory
So just get rid of OMX_VIDEO_PATH and directly refer to the folders.
Change-Id: I195994b2f3d07b975b1612f58fa3e80af70e3e93
| -rw-r--r-- | mm-video-v4l2/Android.mk | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mm-video-v4l2/Android.mk b/mm-video-v4l2/Android.mk index 36752138..6361f9b8 100644 --- a/mm-video-v4l2/Android.mk +++ b/mm-video-v4l2/Android.mk @@ -1,2 +1,2 @@ -OMX_VIDEO_PATH := $(call my-dir) -include $(call all-makefiles-under,$(OMX_VIDEO_PATH)) +LOCAL_PATH := $(call my-dir) +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index 68060a69..e614b2de 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -61,10 +61,10 @@ include $(CLEAR_VARS) # Common Includes libmm-vdec-inc := $(LOCAL_PATH)/inc -libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc +libmm-vdec-inc += $(TOP)/hardware/qcom/media/mm-video-v4l2/vidc/common/inc libmm-vdec-inc += $(TOP)/hardware/qcom/media/mm-core/inc #DRM include - Interface which loads the DRM library -libmm-vdec-inc += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc +libmm-vdec-inc += $(TOP)/hardware/qcom/media/mm-video-v4l2/DivxDrmDecrypt/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 diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index 85a05944..761f77d1 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -47,7 +47,7 @@ endif # Common Includes libmm-venc-inc := $(LOCAL_PATH)/inc -libmm-venc-inc += $(OMX_VIDEO_PATH)/vidc/common/inc +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 += $(TARGET_OUT_HEADERS)/qcom/display |