diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-10-19 14:32:43 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-19 14:32:43 -0700 |
| commit | f542046bc9184ee1eb70804ed32fe64dae03ad29 (patch) | |
| tree | 3757ce750cf0e6bae6f6b3851b61cb3d0fc72079 /qcwcn | |
| parent | 829094bfff197c70ceb53d60cb23fb4617fcbb82 (diff) | |
| parent | 4e08ace08138f2ab1f3454fbc829517a46ffa66d (diff) | |
| download | wlan-f542046bc9184ee1eb70804ed32fe64dae03ad29.tar.gz | |
Merge "Allow implicit-fallthrough warnings locally." am: f71546676c am: 421c5642c9
am: 4e08ace081
Change-Id: I484828be8b58ab1e76d88a7cd42bec2832d0ac79
Diffstat (limited to 'qcwcn')
| -rw-r--r-- | qcwcn/wifi_hal/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
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_CLANG_CFLAGS := -Wno-pointer-bool-conversion 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 @@ endif # 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 \ |