Merge "Disable -Wimplicit-fallthrough unless src is fixed."
diff --git a/msm8909/sdm/libs/hwc/Android.mk b/msm8909/sdm/libs/hwc/Android.mk
index 11495b9..4e52424 100644
--- a/msm8909/sdm/libs/hwc/Android.mk
+++ b/msm8909/sdm/libs/hwc/Android.mk
@@ -20,7 +20,7 @@
libdrmutils libui
# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
-LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+LOCAL_CFLAGS += -Wno-implicit-fallthrough
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_display.cpp \
diff --git a/msm8909/sdm/libs/hwc2/Android.mk b/msm8909/sdm/libs/hwc2/Android.mk
index 7fab146..c188b37 100644
--- a/msm8909/sdm/libs/hwc2/Android.mk
+++ b/msm8909/sdm/libs/hwc2/Android.mk
@@ -37,7 +37,7 @@
endif
# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
-LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+LOCAL_CFLAGS += -Wno-implicit-fallthrough
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_session_services.cpp \
diff --git a/msm8909w_3100/sdm/libs/hwc/Android.mk b/msm8909w_3100/sdm/libs/hwc/Android.mk
index 11495b9..4e52424 100644
--- a/msm8909w_3100/sdm/libs/hwc/Android.mk
+++ b/msm8909w_3100/sdm/libs/hwc/Android.mk
@@ -20,7 +20,7 @@
libdrmutils libui
# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
-LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+LOCAL_CFLAGS += -Wno-implicit-fallthrough
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_display.cpp \
diff --git a/msm8909w_3100/sdm/libs/hwc2/Android.mk b/msm8909w_3100/sdm/libs/hwc2/Android.mk
index ff16de5..cc28b8c 100644
--- a/msm8909w_3100/sdm/libs/hwc2/Android.mk
+++ b/msm8909w_3100/sdm/libs/hwc2/Android.mk
@@ -33,7 +33,7 @@
endif
# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
-LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+LOCAL_CFLAGS += -Wno-implicit-fallthrough
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_session_services.cpp \
diff --git a/msm8996/sdm/libs/hwc/Android.mk b/msm8996/sdm/libs/hwc/Android.mk
index 154b16b..a34e9c8 100644
--- a/msm8996/sdm/libs/hwc/Android.mk
+++ b/msm8996/sdm/libs/hwc/Android.mk
@@ -19,7 +19,7 @@
libpowermanager libsdmutils libc++
# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
-LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+LOCAL_CFLAGS += -Wno-implicit-fallthrough
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_display.cpp \
diff --git a/msm8996/sdm/libs/hwc2/Android.mk b/msm8996/sdm/libs/hwc2/Android.mk
index f4150b1..532436b 100644
--- a/msm8996/sdm/libs/hwc2/Android.mk
+++ b/msm8996/sdm/libs/hwc2/Android.mk
@@ -26,7 +26,7 @@
endif
# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
-LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+LOCAL_CFLAGS += -Wno-implicit-fallthrough
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_display.cpp \
diff --git a/msm8998/sdm/libs/hwc2/Android.mk b/msm8998/sdm/libs/hwc2/Android.mk
index bfba7b6..574226e 100644
--- a/msm8998/sdm/libs/hwc2/Android.mk
+++ b/msm8998/sdm/libs/hwc2/Android.mk
@@ -21,7 +21,7 @@
libsdmutils libc++ liblog libdrmutils libui libgpu_tonemapper
# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
-LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+LOCAL_CFLAGS += -Wno-implicit-fallthrough
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_display.cpp \
@@ -38,9 +38,6 @@
hwc_socket_handler.cpp \
hwc_buffer_allocator.cpp
-# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
-LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
-
ifeq ($(TARGET_HAS_WIDE_COLOR_DISPLAY), true)
LOCAL_CFLAGS += -DFEATURE_WIDE_COLOR
endif
