summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chih-hung Hsieh <chh@google.com> 2018-10-19 18:05:02 -0700
committer android-build-merger <android-build-merger@google.com> 2018-10-19 18:05:02 -0700
commit0db2c27df7d2daa77f0887f462a2ba5f4c8cd1da (patch)
treef55641dff84ed6fd1746b280e0c33fa00af87d2c
parenta6c90c99cda6bfba411c75af10f5ff01dfebe962 (diff)
parentdd68cf76deb2f73b3b159cef27ee0da7803897bc (diff)
Merge "Allow implicit-fallthrough warnings locally."
am: dd68cf76de Change-Id: I766924c1a8ba06275401f96882ddad41cfe035bd
-rw-r--r--cmds/incidentd/Android.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/cmds/incidentd/Android.mk b/cmds/incidentd/Android.mk
index db864aed6bdc..eba558653b04 100644
--- a/cmds/incidentd/Android.mk
+++ b/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) \