commit 421c5642c961a26255ff114e937327417c54ca12
author Chih-Hung Hsieh <chh@google.com> Fri Oct 19 14:20:09 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 19 14:20:09 2018 -0700
tree 856038febf4f9efc4a2f61956587833c01dd48f3
parent ba979c3265d5a4cd522f92169fd5c3b14ee1f26c
parent f71546676cdd30d7b3167f598b821f6b463e9af2

Merge "Allow implicit-fallthrough warnings locally."
am: f71546676c

Change-Id: I612116de163b475acb229e3da13db15671128711

qcwcn/wifi_hal/Android.mk

diff --git a/qcwcn/wifi_hal/Android.mk b/qcwcn/wifi_hal/Android.mk
index 0f82f9c..639ccdb 100644
--- a/qcwcn/wifi_hal/Android.mk
+++ b/qcwcn/wifi_hal/Android.mk
@@ -28,6 +28,9 @@
 
 LOCAL_CFLAGS += -Wall -Werror
 
+# Allow implicit fallthrough in nan_ind.cpp:834 until it is fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
 LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH) \
 	external/libnl/include \
@@ -90,6 +93,9 @@
 # gscan.cpp: address of array 'cached_results[i].results' will always evaluate to 'true'
 LOCAL_CLANG_CFLAGS := -Wno-pointer-bool-conversion
 
+# Allow implicit fallthrough in nan_ind.cpp:834 until it is fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
 LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH) \
 	external/libnl/include \