Merge "Merge pi-dr1-dev to aosp-master"
diff --git a/msm8998/libc2dcolorconvert/Android.mk b/msm8998/libc2dcolorconvert/Android.mk
index 8c767ba..4898968 100644
--- a/msm8998/libc2dcolorconvert/Android.mk
+++ b/msm8998/libc2dcolorconvert/Android.mk
@@ -7,6 +7,9 @@
LOCAL_CFLAGS := -Wall -Werror
+# Allow implicit fallthrough in C2DColorConverter.cpp:554 until it is fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
LOCAL_C_INCLUDES := \
$(TARGET_OUT_HEADERS)/adreno
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/qcom/display
diff --git a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk
index 250350e..4c44fc8 100644
--- a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk
@@ -133,6 +133,9 @@
LOCAL_CFLAGS += -Wno-error
+# Allow implicit fallthrough in omx_vdec_v4l2.cpp:5409 until it is fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
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 a66593b..4080333 100644
--- a/msm8998/mm-video-v4l2/vidc/venc/Android.mk
+++ b/msm8998/mm-video-v4l2/vidc/venc/Android.mk
@@ -132,6 +132,9 @@
LOCAL_SRC_FILES += src/omx_video_encoder.cpp
LOCAL_SRC_FILES += src/video_encoder_device_v4l2.cpp
+# Allow implicit fallthrough in omx_video_encoder.cpp:2322 until it is fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
include $(BUILD_SHARED_LIBRARY)
ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_VENC_MPEG4)),true)
