Merge "Allow implicit-fallthrough warnings locally."

am: dd68cf76de

Change-Id: I766924c1a8ba06275401f96882ddad41cfe035bd
This commit is contained in:
Chih-hung Hsieh
2018-10-19 18:05:02 -07:00
committed by android-build-merger

View File

@@ -33,6 +33,9 @@ LOCAL_SRC_FILES := $(call all-cpp-files-under, src) \
LOCAL_CFLAGS += \ LOCAL_CFLAGS += \
-Wall -Werror -Wno-missing-field-initializers -Wno-unused-variable -Wunused-parameter -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,) ifeq (debug,)
LOCAL_CFLAGS += \ LOCAL_CFLAGS += \
-g -O0 -g -O0
@@ -100,6 +103,9 @@ LOCAL_MODULE_TAGS := tests
LOCAL_CFLAGS := -Werror -Wall -Wno-unused-variable -Wunused-parameter 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_C_INCLUDES += $(LOCAL_PATH)/src
LOCAL_SRC_FILES := $(call all-cpp-files-under, tests) \ LOCAL_SRC_FILES := $(call all-cpp-files-under, tests) \