am 1112f2fc: Merge "exynos: vdec: support disabling metadata and native buffer modes...

* commit '1112f2fc374699af6ea7c40dc5e57f0bfd77c338':
  exynos: vdec: support disabling metadata and native buffer modes

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 8cd824873a789a0c8f0d0eb2b8a43f912f9551df..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
@@ -13,7 +17,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_MODULE := libExynosVideoApi
 LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
 LOCAL_ARM_MODE := arm
 
 include $(BUILD_STATIC_LIBRARY)

diff --git a/exynos_omx/openmax/exynos_omx/component/audio/dec/mp3/Android.mk b/exynos_omx/openmax/exynos_omx/component/audio/dec/mp3/Android.mk
index 57fd44e36b7c510df122e9f43afc7f00c39ee859..6586ec2dc24fff362bb6922d83893bd917c300e3 100644 (file)
--- a/exynos_omx/openmax/exynos_omx/component/audio/dec/mp3/Android.mk
+++ b/exynos_omx/openmax/exynos_omx/component/audio/dec/mp3/Android.mk
@@ -7,7 +7,6 @@ LOCAL_SRC_FILES := \
        Exynos_OMX_Mp3dec.c \
        library_register.c
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libOMX.Exynos.MP3.Decoder
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
 

diff --git a/exynos_omx/openmax/exynos_omx/component/common/Android.mk b/exynos_omx/openmax/exynos_omx/component/common/Android.mk
index c1e61240cba3eca90a7310bb32a79560a8b373bd..81c9da70eddeb668943a12fd1169932b4765a0e9 100644 (file)
--- a/exynos_omx/openmax/exynos_omx/component/common/Android.mk
+++ b/exynos_omx/openmax/exynos_omx/component/common/Android.mk
@@ -27,7 +27,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
        Exynos_OMX_Resourcemanager.c
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libExynosOMX_Resourcemanager
 
 LOCAL_CFLAGS :=

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 984bd9dd8e574cc4c6d76d9d1e48872f76125819..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,13 +1,14 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_CLANG_CFLAGS += -Wno-int-conversion
+
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := \
        Exynos_OMX_H264dec.c \
        library_register.c
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libOMX.Exynos.AVC.Decoder
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
 

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 d3dec8e711137e5994c8c3f860527bdf2577927d..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,13 +1,14 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_CLANG_CFLAGS += -Wno-int-conversion
+
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := \
        Exynos_OMX_Mpeg4dec.c \
        library_register.c
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libOMX.Exynos.MPEG4.Decoder
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
 

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 a6f562826f466753db61434dda823bd7d8b70c83..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,13 +1,14 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_CLANG_CFLAGS += -Wno-int-conversion
+
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := \
        Exynos_OMX_Vp8dec.c \
        library_register.c
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libOMX.Exynos.VP8.Decoder
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
 

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 716fcd87dd262ae883602c77a9f8513983805f4f..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,13 +1,14 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_CLANG_CFLAGS += -Wno-int-conversion
+
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := \
        Exynos_OMX_H264enc.c \
        library_register.c
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libOMX.Exynos.AVC.Encoder
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
 

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 c7bdebf6df1ea4c9af662bff958773789e9d7bbd..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,13 +1,14 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_CLANG_CFLAGS += -Wno-int-conversion
+
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := \
        Exynos_OMX_Mpeg4enc.c \
        library_register.c
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libOMX.Exynos.MPEG4.Encoder
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
 

diff --git a/exynos_omx/openmax/exynos_omx/core/Android.mk b/exynos_omx/openmax/exynos_omx/core/Android.mk
index 7de591da202ebcb8ced939f755928dfcfa5b405f..253d49efb52c1fb5b3a47777763c936f43e3c387 100644 (file)
--- a/exynos_omx/openmax/exynos_omx/core/Android.mk
+++ b/exynos_omx/openmax/exynos_omx/core/Android.mk
@@ -7,7 +7,6 @@ LOCAL_SRC_FILES := \
        Exynos_OMX_Component_Register.c \
        Exynos_OMX_Core.c
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libExynosOMX_Core
 
 LOCAL_CFLAGS :=

diff --git a/exynos_omx/openmax/exynos_omx/osal/Android.mk b/exynos_omx/openmax/exynos_omx/osal/Android.mk
index ec9127a9a2679cb83270e0939a6b97536fcfa2ea..ef1ce87294ad17e061d84496abdbab173749d1b4 100644 (file)
--- a/exynos_omx/openmax/exynos_omx/osal/Android.mk
+++ b/exynos_omx/openmax/exynos_omx/osal/Android.mk
@@ -16,11 +16,15 @@ LOCAL_SRC_FILES := \
        Exynos_OSAL_Log.c \
        Exynos_OSAL_SharedMemory.c
 
-LOCAL_PRELINK_MODULE := false
 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/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp b/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp
index b91365b1813639ebe97f5e5b978c821aac46584f..b128aafe39d68dae01f6c4be9712d16cedd5e432 100644 (file)
--- a/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp
+++ b/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp
@@ -81,7 +81,7 @@ OMX_ERRORTYPE Exynos_OSAL_LockANBHandle(
     GraphicBufferMapper &mapper = GraphicBufferMapper::get();
     buffer_handle_t bufferHandle = (buffer_handle_t) handle;
     private_handle_t *priv_hnd = (private_handle_t *) bufferHandle;
-    Rect bounds(width, height);
+    Rect bounds((uint32_t)width, (uint32_t)height);
     ExynosVideoPlane *vplanes = (ExynosVideoPlane *) planes;
     void *vaddr[MAX_BUFFER_PLANE];
 

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/libcamera2/ExynosJpegEncoderForCamera.cpp b/libcamera2/ExynosJpegEncoderForCamera.cpp
index 9eb924fe192457bc904727e529c8754211a3666c..14d73afa52185b62d3cab8467f41c3dd3c30df70 100644 (file)
--- a/libcamera2/ExynosJpegEncoderForCamera.cpp
+++ b/libcamera2/ExynosJpegEncoderForCamera.cpp
@@ -17,6 +17,7 @@
 
 #define LOG_TAG "ExynosJpegForCamera"
 #include <utils/Log.h>
+#include <string.h>
 
 #include "ExynosJpegEncoderForCamera.h"
 

diff --git a/libcsc/Android.mk b/libcsc/Android.mk
index bbf0ece9eda0ef357145c51e94198497f741c3e3..c485b991e3ecf64aeeaecde11c0ccb22bdabe843 100644 (file)
--- a/libcsc/Android.mk
+++ b/libcsc/Android.mk
@@ -44,7 +44,6 @@ LOCAL_CFLAGS :=
 
 LOCAL_MODULE := libcsc
 
-LOCAL_PRELINK_MODULE := false
 
 LOCAL_ARM_MODE := arm
 

diff --git a/libcsc/csc.c b/libcsc/csc.c
index 0831f612b1ecc5e446f4d376dcbdca8c4ae8560a..f16502acad6d5dca4a77d5042a58e62a9eeeaefd 100644 (file)
--- a/libcsc/csc.c
+++ b/libcsc/csc.c
@@ -30,6 +30,7 @@
 #define LOG_TAG "libcsc"
 #include <cutils/log.h>
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <utils/Log.h>

diff --git a/libexynosutils/Android.mk b/libexynosutils/Android.mk
index 627e823b198b903d9d0a45df73de26eb10691615..90b7e708572d9432f7243922212e6d4e175ba17a 100644 (file)
--- a/libexynosutils/Android.mk
+++ b/libexynosutils/Android.mk
@@ -15,7 +15,6 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_SHARED_LIBRARIES := liblog libutils libcutils
 
 LOCAL_CFLAGS += -DEXYNOS_PLATFORM_ON_ANDROID

diff --git a/libgscaler/Android.mk b/libgscaler/Android.mk
index 144f19b0ac77d899352feb786b995287b80548dd..5f3c9ad28d4c113ca42cb8ab47fd62e86687039d 100644 (file)
--- a/libgscaler/Android.mk
+++ b/libgscaler/Android.mk
@@ -17,7 +17,8 @@ ifeq ($(filter-out exynos5,$(TARGET_BOARD_PLATFORM)),)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_PRELINK_MODULE := false
+LOCAL_CLANG_CFLAGS += -Wno-int-conversion
+
 LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils libexynosv4l2
 
 # to talk to secure side

diff --git a/libhwc/Android.mk b/libhwc/Android.mk
index 5ef93737b3b56f10ed8cc5233b4fcfdcc2356f95..123d20dbe970211721eca0e6f445d415e7961161 100644 (file)
--- a/libhwc/Android.mk
+++ b/libhwc/Android.mk
@@ -17,7 +17,6 @@ LOCAL_PATH:= $(call my-dir)
 # hw/<COPYPIX_HARDWARE_MODULE_ID>.<ro.product.board>.so
 
 include $(CLEAR_VARS)
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/hw
 LOCAL_SHARED_LIBRARIES := liblog libcutils libEGL libGLESv1_CM libhardware \
     libhardware_legacy libion_exynos libutils libsync libexynosgscaler libexynosv4l2 libMcClient

diff --git a/librotator/Android.mk b/librotator/Android.mk
index 518523542051e2d4c00351fe5186a9f5bba6fff6..8b01e858f24e7bc18eff49448e1c2f5b43b582a9 100644 (file)
--- a/librotator/Android.mk
+++ b/librotator/Android.mk
@@ -17,7 +17,6 @@ ifeq ($(filter-out exynos5,$(TARGET_BOARD_PLATFORM)),)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils libexynosv4l2
 
 LOCAL_C_INCLUDES := \

diff --git a/libswconverter/Android.mk b/libswconverter/Android.mk
index be9d2bc4bd1f19546b904fa3b0887811e4494e8b..b37a1e90c4e455fad5c363080330307acdca7649 100644 (file)
--- a/libswconverter/Android.mk
+++ b/libswconverter/Android.mk
@@ -18,7 +18,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_MODULE := libswconverter
 
-LOCAL_PRELINK_MODULE := false
 
 LOCAL_CFLAGS :=
 

diff --git a/libv4l2/Android.mk b/libv4l2/Android.mk
index a05bbd601911c2443071caa737f51a2482fba763..90d8bfd594897cdf63fd3e606c3033b60c004667 100644 (file)
--- a/libv4l2/Android.mk
+++ b/libv4l2/Android.mk
@@ -31,7 +31,6 @@ LOCAL_SHARED_LIBRARIES := \
        libexynosutils 
 
 LOCAL_MODULE := libexynosv4l2
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_TAGS := eng
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/mobicore/Android.mk b/mobicore/Android.mk
index c89cb228edb9291d16d2eba604a565286df077e8..707520044ce629a78d41794957498f95e8bebbfb 100644 (file)
--- a/mobicore/Android.mk
+++ b/mobicore/Android.mk
@@ -11,14 +11,11 @@ COMP_PATH_MobiCoreDriverMod := $(MOBICORE_PROJECT_PATH)/include
 
 
 # Application wide Cflags
-GLOBAL_INCLUDES := bionic \
-       external/stlport/stlport \
+GLOBAL_INCLUDES := \
        $(COMP_PATH_MobiCore)/inc \
        $(COMP_PATH_MobiCoreDriverMod)/Public \
        $(COMP_PATH_MobiCore)/inc/TlCm
 
-GLOBAL_LIBRARIES := libstlport
-
 # Include the Daemon
 include $(MOBICORE_PROJECT_PATH)/daemon/Android.mk
 

diff --git a/mobicore/common/LogWrapper/log.h b/mobicore/common/LogWrapper/log.h
index 36c174625dd81799f7c809dd2bb11252a3add9c6..041793c040b8fe32b73f4500d4bc3164e4ee4702 100644 (file)
--- a/mobicore/common/LogWrapper/log.h
+++ b/mobicore/common/LogWrapper/log.h
@@ -36,6 +36,7 @@
 
 #include <unistd.h>
 #include <stdio.h>
+#include <string.h>
 #include <android/log.h>
 
 /** LOG_I(fmt, args...)
@@ -68,8 +69,8 @@
     #define LOG_W(fmt, args...) DUMMY_FUNCTION()
 #else
     // add LINE
-    #define LOG_I(fmt, args...) LOG_i(fmt";%d", ## args, __LINE__)
-    #define LOG_W(fmt, args...) LOG_w(fmt";%d", ## args, __LINE__)
+    #define LOG_I(fmt, args...) LOG_i(fmt ";%d", ## args, __LINE__)
+    #define LOG_W(fmt, args...) LOG_w(fmt ";%d", ## args, __LINE__)
 #endif
     // LOG_E is always defined
     #define _LOG_E(fmt, args...) LOG_e(fmt, ## args)
@@ -98,10 +99,10 @@
     #define LOG_I(fmt, args...) DUMMY_FUNCTION()
     #define LOG_W(fmt, args...) DUMMY_FUNCTION()
 #else
-    #define LOG_I(...)  _LOG_x("I",__VA_ARGS__)
-    #define LOG_W(...)  _LOG_x("W",__VA_ARGS__)
+    #define LOG_I(...)  _LOG_x("I", __VA_ARGS__)
+    #define LOG_W(...)  _LOG_x("W", __VA_ARGS__)
 #endif
-    #define _LOG_E(...)  _LOG_x("E",__VA_ARGS__)
+    #define _LOG_E(...)  _LOG_x("E", __VA_ARGS__)
 
 #endif //defined(LOG_ANDROID)
 
@@ -118,7 +119,7 @@
             do \
             { \
                 _LOG_E("  *****************************"); \
-                _LOG_E("  *** ERROR: "__VA_ARGS__); \
+                _LOG_E("  *** ERROR: " __VA_ARGS__); \
                 _LOG_E("  *** Detected in %s:%i/%s()", __FILE__, __LINE__, __FUNCTION__); \
                 _LOG_E("  *****************************"); \
             } while(1!=1)

diff --git a/mobicore/daemon/Daemon/Server/NetlinkServer.cpp b/mobicore/daemon/Daemon/Server/NetlinkServer.cpp
index cdf80f5e86815b6e630e26544bc7dee0bee7911e..73d08c4d7078bbd67fe6bcc3545b1161dd78746d 100644 (file)
--- a/mobicore/daemon/Daemon/Server/NetlinkServer.cpp
+++ b/mobicore/daemon/Daemon/Server/NetlinkServer.cpp
@@ -78,7 +78,7 @@ void NetlinkServer::run(
         src_addr.nl_family = AF_NETLINK;
         src_addr.nl_pid = MC_DAEMON_PID;  /* daemon pid */
         src_addr.nl_groups = 0;  /* not in mcast groups */
-        if (bind(serverSock, (struct sockaddr *)&src_addr, sizeof(src_addr)) < 0) {
+        if (::bind(serverSock, (struct sockaddr *)&src_addr, sizeof(src_addr)) < 0) {
             LOG_ERRNO("Binding to server socket failed, because bind");
             close(serverSock);
             break;

diff --git a/mobicore/daemon/Kernel/CKMod.cpp b/mobicore/daemon/Kernel/CKMod.cpp
index 030089dd3951a7c579c943e29e3d423945899d4b..30210dbff4b0d14c8f57144f9c00e32ed588f5c0 100644 (file)
--- a/mobicore/daemon/Kernel/CKMod.cpp
+++ b/mobicore/daemon/Kernel/CKMod.cpp
@@ -31,6 +31,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <cstdlib>
+#include <cstring>
 
 #include <fcntl.h>
 #include <sys/mman.h>