Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aa44d9a authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Android (Google) Code Review
Browse files

Merge "Allow implicit-fallthrough warnings locally."

parents f7994fe6 e1afb6cb

cmds/incidentd/Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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;