Merge "Allow implicit-fallthrough warnings locally."

cmds/incidentd/Android.mk

@@ -33,6 +33,9 @@ LOCAL_SRC_FILES := $(call all-cpp-files-under, src) \
 LOCAL_CFLAGS += \
         -Wall -Werror -Wno-missing-field-initializers -Wno-unused-variable -Wunused-parameter
 
+# Allow implicit fallthrough in IncidentService.cpp:85 until it is fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
 ifeq (debug,)
     LOCAL_CFLAGS += \
             -g -O0
@@ -100,6 +103,9 @@ LOCAL_MODULE_TAGS := tests
 
 LOCAL_CFLAGS := -Werror -Wall -Wno-unused-variable -Wunused-parameter
 
+# Allow implicit fallthrough in IncidentService.cpp:85 until it is fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/src
 
 LOCAL_SRC_FILES := $(call all-cpp-files-under, tests) \

libs/hwui/Android.bp

@@ -231,6 +231,9 @@ cc_defaults {
         "protos/graphicsstats.proto",
     ],
 
+    // Allow implicit fallthroughs in HardwareBitmapUploader.cpp until they are fixed.
+    cflags: ["-Wno-implicit-fallthrough"],
+
     proto: {
         export_proto_headers: true,
     },

libs/hwui/tests/macrobench/main.cpp

@@ -288,7 +288,7 @@ void parseOptions(int argc, char* argv[]) {
 
             case '?':
                 fprintf(stderr, "Unrecognized option '%s'\n", argv[optind - 1]);
-            // fall-through
+                [[fallthrough]];
             default:
                 error = true;
                 break;