Suppress or fix clang errors before the fix from upstream.

* Make Exynos_UpdateFrameSize global to link with other modules.
* Suppress warnings about int conversion, pointer conversion,
  implicit function declaration, sign/unsign comparison, and
  c++11-narrowing.

Change-Id: I462902cbc0d1c3442d59a6741c66d8a870a99e8c

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 a5b70d0b7a61214d451e70e9f59072991771dfff..f6ab869bd2373b95503a3874df2fcd9c2d5d45da 100644 (file)
--- 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 816f04445a0e53693ce20a4fb6635f1879bff140..bc40bb607e7d3e2cacafc101fc2319dc3e666ac3 100644 (file)
--- 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 d16d811ed4aa77c193bfa50827bf3451f9689c87..cba6046b2415a8e5ce0f3d23526f2bef4baf67bd 100644 (file)
--- 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 db306870df3fd60ff8e74c55b76092086306e866..57ddf766145e613f04ace2fe52f641009e70992b 100644 (file)
--- 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 8a5a73708ab43272a6033c2b66592ddf6124d2b9..56484369a56165fbacee3238e815420374cff2e6 100644 (file)
--- 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 a512f70cefe868f097406489398111a357bcfa60..06ca1ff29ec4416d829cf593cec06740465601ae 100644 (file)
--- 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 2435e0f064b239b8fb0af022d2477e9dd5a19c9d..558dddab0dba5b153aa24152c1da58c822abf8eb 100644 (file)
--- 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 e271ff4a32aa6aec2e851b29023d67f92dd23c52..8a443dbf281f574913b00d45867a1f1b4f55bf77 100644 (file)
--- 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 fa6ded87eef3614b30a70c99e7fb04f36585f224..8da4444ec2058b21a59831f2cc9885921eade6ee 100644 (file)
--- 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 78c7a6313d68de17be32da358afd9c0cf8d36fd2..f4e2e28884dd75fad9a77aacb01c1a38afefabd4 100644 (file)
--- 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 a003dbfdcef08efd56c21ed0378de60639121568..ef1ce87294ad17e061d84496abdbab173749d1b4 100644 (file)
--- 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 274dc7a3fc880fb6888847e44e9b37461a695ef2..bf87b186406348b00f97143391547fd25a162496 100644 (file)
--- 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 8cbe1b12e26502bc7db1df4fad2277472df92673..5f3c9ad28d4c113ca42cb8ab47fd62e86687039d 100644 (file)
--- 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