diff options
13 files changed, 29 insertions, 2 deletions
diff --git a/exynos_omx/codecs/exynos_codecs/video/exynos5/mfc_v4l2/Android.mk b/exynos_omx/codecs/exynos_codecs/video/exynos5/mfc_v4l2/Android.mk index a5b70d0..f6ab869 100644 --- a/exynos_omx/codecs/exynos_codecs/video/exynos5/mfc_v4l2/Android.mk +++ b/exynos_omx/codecs/exynos_codecs/video/exynos5/mfc_v4l2/Android.mk @@ -2,6 +2,10 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_CLANG_CFLAGS += \ + -Wno-int-conversion \ + -Wno-incompatible-pointer-types + LOCAL_SRC_FILES := \ dec/src/ExynosVideoDecoder.c \ enc/src/ExynosVideoEncoder.c diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/Android.mk b/exynos_omx/openmax/exynos_omx/component/video/dec/Android.mk index 816f044..bc40bb6 100644 --- a/exynos_omx/openmax/exynos_omx/component/video/dec/Android.mk +++ b/exynos_omx/openmax/exynos_omx/component/video/dec/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_CLANG_CFLAGS += -Wno-int-conversion + LOCAL_SRC_FILES := \ Exynos_OMX_VdecControl.c \ Exynos_OMX_Vdec.c diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_Vdec.c b/exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_Vdec.c index d16d811..cba6046 100644 --- a/exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_Vdec.c +++ b/exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_Vdec.c @@ -65,7 +65,7 @@ int calc_plane(int width, int height) return (mbX * 16) * (mbY * 16); } -inline void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent) +void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent) { EXYNOS_OMX_BASECOMPONENT *pExynosComponent = (EXYNOS_OMX_BASECOMPONENT *)pOMXComponent->pComponentPrivate; EXYNOS_OMX_BASEPORT *exynosInputPort = &pExynosComponent->pExynosPort[INPUT_PORT_INDEX]; diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/h264/Android.mk b/exynos_omx/openmax/exynos_omx/component/video/dec/h264/Android.mk index db30687..57ddf76 100644 --- a/exynos_omx/openmax/exynos_omx/component/video/dec/h264/Android.mk +++ b/exynos_omx/openmax/exynos_omx/component/video/dec/h264/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_CLANG_CFLAGS += -Wno-int-conversion + LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Android.mk b/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Android.mk index 8a5a737..5648436 100644 --- a/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Android.mk +++ b/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_CLANG_CFLAGS += -Wno-int-conversion + LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/vp8/Android.mk b/exynos_omx/openmax/exynos_omx/component/video/dec/vp8/Android.mk index a512f70..06ca1ff 100644 --- a/exynos_omx/openmax/exynos_omx/component/video/dec/vp8/Android.mk +++ b/exynos_omx/openmax/exynos_omx/component/video/dec/vp8/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_CLANG_CFLAGS += -Wno-int-conversion + LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ diff --git a/exynos_omx/openmax/exynos_omx/component/video/enc/Android.mk b/exynos_omx/openmax/exynos_omx/component/video/enc/Android.mk index 2435e0f..558ddda 100644 --- a/exynos_omx/openmax/exynos_omx/component/video/enc/Android.mk +++ b/exynos_omx/openmax/exynos_omx/component/video/enc/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_CLANG_CFLAGS += -Wno-int-conversion + LOCAL_SRC_FILES := \ Exynos_OMX_VencControl.c \ Exynos_OMX_Venc.c diff --git a/exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_Venc.c b/exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_Venc.c index e271ff4..8a443db 100644 --- a/exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_Venc.c +++ b/exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_Venc.c @@ -52,7 +52,7 @@ #include "Exynos_OSAL_Log.h" -inline void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent) +void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent) { EXYNOS_OMX_BASECOMPONENT *pExynosComponent = (EXYNOS_OMX_BASECOMPONENT *)pOMXComponent->pComponentPrivate; EXYNOS_OMX_BASEPORT *exynosInputPort = &pExynosComponent->pExynosPort[INPUT_PORT_INDEX]; diff --git a/exynos_omx/openmax/exynos_omx/component/video/enc/h264/Android.mk b/exynos_omx/openmax/exynos_omx/component/video/enc/h264/Android.mk index fa6ded8..8da4444 100644 --- a/exynos_omx/openmax/exynos_omx/component/video/enc/h264/Android.mk +++ b/exynos_omx/openmax/exynos_omx/component/video/enc/h264/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_CLANG_CFLAGS += -Wno-int-conversion + LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ diff --git a/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Android.mk b/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Android.mk index 78c7a63..f4e2e28 100644 --- a/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Android.mk +++ b/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_CLANG_CFLAGS += -Wno-int-conversion + LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ diff --git a/exynos_omx/openmax/exynos_omx/osal/Android.mk b/exynos_omx/openmax/exynos_omx/osal/Android.mk index a003dbf..ef1ce87 100644 --- a/exynos_omx/openmax/exynos_omx/osal/Android.mk +++ b/exynos_omx/openmax/exynos_omx/osal/Android.mk @@ -20,6 +20,11 @@ LOCAL_MODULE := libExynosOMX_OSAL LOCAL_CFLAGS := +LOCAL_CLANG_CFLAGS += \ + -Wno-implicit-function-declaration \ + -Wno-int-conversion \ + -Wno-sign-compare + ifeq ($(BOARD_USE_S3D_SUPPORT), true) LOCAL_CFLAGS += -DS3D_SUPPORT endif diff --git a/libcamera2/Android.mk b/libcamera2/Android.mk index 274dc7a..bf87b18 100644 --- a/libcamera2/Android.mk +++ b/libcamera2/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_CLANG_CFLAGS += -Wno-c++11-narrowing + # HAL module implemenation stored in # hw/<COPYPIX_HARDWARE_MODULE_ID>.<ro.product.board>.so LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/hw diff --git a/libgscaler/Android.mk b/libgscaler/Android.mk index 8cbe1b1..5f3c9ad 100644 --- a/libgscaler/Android.mk +++ b/libgscaler/Android.mk @@ -17,6 +17,8 @@ ifeq ($(filter-out exynos5,$(TARGET_BOARD_PLATFORM)),) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_CLANG_CFLAGS += -Wno-int-conversion + LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils libexynosv4l2 # to talk to secure side |