diff options
| author | Mahesh Lanka <mlanka@codeaurora.org> | 2020-02-27 18:01:56 +0530 |
|---|---|---|
| committer | Paras Nagda <pnagda@codeaurora.org> | 2020-03-27 12:22:50 +0530 |
| commit | d85171d5f3d8db4e8808f220cd2665a07cb228e9 (patch) | |
| tree | 0feb1f035b772a517066841eeacf8b9fa23dff31 | |
| parent | ed70ab607c0fbf0f40f307302d087c750197bc4a (diff) | |
| download | media-d85171d5f3d8db4e8808f220cd2665a07cb228e9.tar.gz | |
mm-video-v4l2: Use LIBION_HEADER_PATH_WRAPPER for including ion.h
- Use LIBION_HEADER_PATH_WRAPPER defined in AndroidBoardCommon.mk
- Wrapper specifies correct path to libion and also insulates
makefile from future path changes to libion
Change-Id: I0b1dc23c4402c210010ee5c0a72cbbc544a4268e
| -rw-r--r-- | mm-video-v4l2/vidc/common/Android.mk | 3 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/mm-video-v4l2/vidc/common/Android.mk b/mm-video-v4l2/vidc/common/Android.mk index 11a4a4c8..c282cfb9 100644 --- a/mm-video-v4l2/vidc/common/Android.mk +++ b/mm-video-v4l2/vidc/common/Android.mk @@ -1,6 +1,6 @@ ROOT_DIR := $(call my-dir) - include $(CLEAR_VARS) +include $(LIBION_HEADER_PATH_WRAPPER) LOCAL_PATH:= $(ROOT_DIR) # --------------------------------------------------------------------------------- @@ -25,6 +25,7 @@ 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) LOCAL_MODULE := libOmxVidcCommon LOCAL_MODULE_TAGS := optional diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index d959ab18..89035384 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -1,5 +1,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +include $(LIBION_HEADER_PATH_WRAPPER) # --------------------------------------------------------------------------------- # Common definitons @@ -56,8 +57,7 @@ include $(CLEAR_VARS) # Common Includes libmm-vdec-inc := $(LOCAL_PATH)/inc -libmm-vdec-inc += $(TOP)/system/core/libion/include -libmm-vdec-inc += $(TOP)/system/core/libion/kernel-headers +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 diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index 34de00d7..aea70b2b 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -1,5 +1,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +include $(LIBION_HEADER_PATH_WRAPPER) # --------------------------------------------------------------------------------- # Common definitons @@ -64,8 +65,7 @@ endif # Common Includes libmm-venc-inc := $(LOCAL_PATH)/inc -libmm-venc-inc += $(TOP)/system/core/libion/include -libmm-venc-inc += $(TOP)/system/core/libion/kernel-headers +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 |