Merge "Allow implicit-fallthrough warnings in hwc_display.cpp etc."
diff --git a/msm8909/sdm/libs/hwc/Android.mk b/msm8909/sdm/libs/hwc/Android.mk
index a2142e3..11495b9 100644
--- a/msm8909/sdm/libs/hwc/Android.mk
+++ b/msm8909/sdm/libs/hwc/Android.mk
@@ -19,6 +19,9 @@
libpowermanager libsdmutils libgpu_tonemapper libc++ liblog \
libdrmutils libui
+# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_display.cpp \
hwc_display_null.cpp \
diff --git a/msm8909/sdm/libs/hwc2/Android.mk b/msm8909/sdm/libs/hwc2/Android.mk
index 2d03c13..7fab146 100644
--- a/msm8909/sdm/libs/hwc2/Android.mk
+++ b/msm8909/sdm/libs/hwc2/Android.mk
@@ -36,6 +36,9 @@
LOCAL_SHARED_LIBRARIES += vendor.display.config@1.1
endif
+# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_session_services.cpp \
hwc_display.cpp \
diff --git a/msm8909w_3100/sdm/libs/hwc/Android.mk b/msm8909w_3100/sdm/libs/hwc/Android.mk
index a2142e3..11495b9 100644
--- a/msm8909w_3100/sdm/libs/hwc/Android.mk
+++ b/msm8909w_3100/sdm/libs/hwc/Android.mk
@@ -19,6 +19,9 @@
libpowermanager libsdmutils libgpu_tonemapper libc++ liblog \
libdrmutils libui
+# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_display.cpp \
hwc_display_null.cpp \
diff --git a/msm8909w_3100/sdm/libs/hwc2/Android.mk b/msm8909w_3100/sdm/libs/hwc2/Android.mk
index 200d5ed..ff16de5 100644
--- a/msm8909w_3100/sdm/libs/hwc2/Android.mk
+++ b/msm8909w_3100/sdm/libs/hwc2/Android.mk
@@ -32,6 +32,9 @@
LOCAL_SHARED_LIBRARIES += libmemalloc
endif
+# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_session_services.cpp \
hwc_display.cpp \
diff --git a/msm8996/sdm/libs/hwc/Android.mk b/msm8996/sdm/libs/hwc/Android.mk
index 7f32a80..154b16b 100644
--- a/msm8996/sdm/libs/hwc/Android.mk
+++ b/msm8996/sdm/libs/hwc/Android.mk
@@ -18,6 +18,9 @@
libutils liblog libcutils libsync libmemalloc libqdutils libdl \
libpowermanager libsdmutils libc++
+# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_display.cpp \
hwc_display_null.cpp \
diff --git a/msm8996/sdm/libs/hwc2/Android.mk b/msm8996/sdm/libs/hwc2/Android.mk
index da48e23..f4150b1 100644
--- a/msm8996/sdm/libs/hwc2/Android.mk
+++ b/msm8996/sdm/libs/hwc2/Android.mk
@@ -15,9 +15,6 @@
-DLOG_TAG=\"SDM\" $(common_flags) \
-I $(display_top)/sdm/libs/hwc
-# Suppress warnings until they are fixed in hwc_display.cpp.
-LOCAL_CFLAGS += -Wno-implicit-fallthrough
-
LOCAL_CLANG := true
LOCAL_SHARED_LIBRARIES := libsdmcore libqservice libbinder libhardware libhardware_legacy \
@@ -28,6 +25,9 @@
LOCAL_SHARED_LIBRARIES += libmemalloc
endif
+# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_display.cpp \
hwc_display_primary.cpp \
diff --git a/msm8998/sdm/libs/hwc2/Android.mk b/msm8998/sdm/libs/hwc2/Android.mk
index 0b332d3..bfba7b6 100644
--- a/msm8998/sdm/libs/hwc2/Android.mk
+++ b/msm8998/sdm/libs/hwc2/Android.mk
@@ -20,6 +20,9 @@
libutils libcutils libsync libqdutils libqdMetaData libdl \
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_SRC_FILES := hwc_session.cpp \
hwc_display.cpp \
hwc_display_primary.cpp \
