Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Change-Id: Iae64408aaa970b193021c8877d52b78477b3a197
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 \
