Merge "Add -Wno-error to compile with global -Werror."
diff --git a/msm8974/libc2dcolorconvert/Android.mk b/msm8974/libc2dcolorconvert/Android.mk
index 4edb0a5..e055c04 100644
--- a/msm8974/libc2dcolorconvert/Android.mk
+++ b/msm8974/libc2dcolorconvert/Android.mk
@@ -5,6 +5,8 @@
LOCAL_SRC_FILES := \
C2DColorConverter.cpp
+LOCAL_CFLAGS += -Wno-error
+
LOCAL_C_INCLUDES := \
$(TARGET_OUT_HEADERS)/qcom/display
diff --git a/msm8974/mm-core/Android.mk b/msm8974/mm-core/Android.mk
index 2e2955c..e2727f5 100644
--- a/msm8974/mm-core/Android.mk
+++ b/msm8974/mm-core/Android.mk
@@ -7,6 +7,7 @@
OMXCORE_CFLAGS += -O0 -fno-inline -fno-short-enums
OMXCORE_CFLAGS += -D_ANDROID_
OMXCORE_CFLAGS += -U_ENABLE_QC_MSG_LOG_
+OMXCORE_CFLAGS += -Wno-error
#===============================================================================
# Figure out the targets
diff --git a/msm8974/mm-core/omxcore/Android.mk b/msm8974/mm-core/omxcore/Android.mk
index 19cee6d..2e9719d 100644
--- a/msm8974/mm-core/omxcore/Android.mk
+++ b/msm8974/mm-core/omxcore/Android.mk
@@ -30,6 +30,7 @@
OMXCORE_CFLAGS += -D_ANDROID_
OMXCORE_CFLAGS += -D_ENABLE_QC_MSG_LOG_
+OMXCORE_CFLAGS += -Wno-error
ifeq ($(TARGET_BOARD_PLATFORM),msm7x30)
MM_CORE_TARGET = 7630
diff --git a/msm8974/mm-video-legacy/vidc/vdec.mk b/msm8974/mm-video-legacy/vidc/vdec.mk
index 798eacf..b8ce48b 100644
--- a/msm8974/mm-video-legacy/vidc/vdec.mk
+++ b/msm8974/mm-video-legacy/vidc/vdec.mk
@@ -83,6 +83,8 @@
LOCAL_SRC_FILES += common/src/extra_data_handler.cpp
LOCAL_SRC_FILES += common/src/vidc_color_converter.cpp
+LOCAL_CFLAGS += -Wno-error
+
include $(BUILD_SHARED_LIBRARY)
# ---------------------------------------------------------------------------------
diff --git a/msm8974/mm-video-legacy/vidc/venc.mk b/msm8974/mm-video-legacy/vidc/venc.mk
index 75e59a1..5285ed6 100644
--- a/msm8974/mm-video-legacy/vidc/venc.mk
+++ b/msm8974/mm-video-legacy/vidc/venc.mk
@@ -73,6 +73,8 @@
LOCAL_SRC_FILES += common/src/extra_data_handler.cpp
+LOCAL_CFLAGS += -Wno-error
+
include $(BUILD_SHARED_LIBRARY)
# -----------------------------------------------------------------------------
diff --git a/msm8974/mm-video-v4l2/vidc/vdec.mk b/msm8974/mm-video-v4l2/vidc/vdec.mk
index 7338d47..c53cc7a 100644
--- a/msm8974/mm-video-v4l2/vidc/vdec.mk
+++ b/msm8974/mm-video-v4l2/vidc/vdec.mk
@@ -139,6 +139,8 @@
# omx_vdec_msm8974.cpp:9375:16: address of array 'extra->data' will always evaluate to 'true'
LOCAL_CLANG_CFLAGS += -Wno-pointer-bool-conversion
+LOCAL_CFLAGS += -Wno-error
+
include $(BUILD_SHARED_LIBRARY)
@@ -172,6 +174,8 @@
LOCAL_SRC_FILES += common/src/extra_data_handler.cpp
LOCAL_SRC_FILES += common/src/vidc_color_converter.cpp
+LOCAL_CFLAGS += -Wno-error
+
#include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/msm8974/mm-video-v4l2/vidc/venc.mk b/msm8974/mm-video-v4l2/vidc/venc.mk
index f019bc2..65cce9d 100644
--- a/msm8974/mm-video-v4l2/vidc/venc.mk
+++ b/msm8974/mm-video-v4l2/vidc/venc.mk
@@ -106,6 +106,8 @@
LOCAL_SRC_FILES += common/src/extra_data_handler.cpp
+LOCAL_CFLAGS += -Wno-error
+
include $(BUILD_SHARED_LIBRARY)
endif #BUILD_TINY_ANDROID
diff --git a/msm8996/libc2dcolorconvert/Android.mk b/msm8996/libc2dcolorconvert/Android.mk
index 1871864..ec30280 100644
--- a/msm8996/libc2dcolorconvert/Android.mk
+++ b/msm8996/libc2dcolorconvert/Android.mk
@@ -5,6 +5,8 @@
LOCAL_SRC_FILES := \
C2DColorConverter.cpp
+LOCAL_CFLAGS += -Wno-error
+
LOCAL_C_INCLUDES := \
$(TARGET_OUT_HEADERS)/qcom/display
diff --git a/msm8996/mm-core/Android.mk b/msm8996/mm-core/Android.mk
index bd1f7d8..14594d4 100644
--- a/msm8996/mm-core/Android.mk
+++ b/msm8996/mm-core/Android.mk
@@ -7,6 +7,7 @@
OMXCORE_CFLAGS += -O0 -fno-inline -fno-short-enums
OMXCORE_CFLAGS += -D_ANDROID_
OMXCORE_CFLAGS += -U_ENABLE_QC_MSG_LOG_
+OMXCORE_CFLAGS += -Wno-error
#===============================================================================
# Figure out the targets
diff --git a/msm8996/mm-video-v4l2/vidc/vdec/Android.mk b/msm8996/mm-video-v4l2/vidc/vdec/Android.mk
index 4ee8802..12ad685 100644
--- a/msm8996/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/msm8996/mm-video-v4l2/vidc/vdec/Android.mk
@@ -127,6 +127,8 @@
LOCAL_STATIC_LIBRARIES := libOmxVidcCommon
LOCAL_SRC_FILES += src/omx_vdec_v4l2.cpp
+LOCAL_CFLAGS += -Wno-error
+
include $(BUILD_SHARED_LIBRARY)
@@ -169,6 +171,8 @@
LOCAL_STATIC_LIBRARIES := libOmxVidcCommon
+LOCAL_CFLAGS += -Wno-error
+
include $(BUILD_SHARED_LIBRARY)
endif
endif
diff --git a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk
index 5976add..250350e 100644
--- a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk
@@ -131,6 +131,8 @@
LOCAL_STATIC_LIBRARIES := libOmxVidcCommon
LOCAL_SRC_FILES += src/omx_vdec_v4l2.cpp
+LOCAL_CFLAGS += -Wno-error
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/msm8998/mm-video-v4l2/vidc/venc/Android.mk b/msm8998/mm-video-v4l2/vidc/venc/Android.mk
index fbd9d78..a66593b 100644
--- a/msm8998/mm-video-v4l2/vidc/venc/Android.mk
+++ b/msm8998/mm-video-v4l2/vidc/venc/Android.mk
@@ -162,6 +162,8 @@
LOCAL_SRC_FILES := src/omx_video_base.cpp
LOCAL_SRC_FILES += src/omx_swvenc_mpeg4.cpp
+LOCAL_CFLAGS += -Wno-error
+
include $(BUILD_SHARED_LIBRARY)
endif
