diff options
author | Chih-Hung Hsieh <chh@google.com> | 2019-04-24 14:39:58 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-24 14:39:58 -0700 |
commit | 836fac4fcb5dab2b2c565b4b652b392e646bda6a (patch) | |
tree | 35dec3315446118dc63f7423be9e1aa409d8514f /qcwcn | |
parent | 3929c85d870259884a13c6efe3c05e6b97cae649 (diff) | |
parent | 80441c10e00eb4b73d53558aae124b27cf2e3660 (diff) | |
download | wlan-836fac4fcb5dab2b2c565b4b652b392e646bda6a.tar.gz |
Merge "Disable -Wimplicit-fallthrough unless src is fixed." am: 846ffa3252
am: 80441c10e0
Change-Id: Ie605016d03c4bc53ee1f07117d1b57ccae9795ba
Diffstat (limited to 'qcwcn')
-rw-r--r-- | qcwcn/wifi_hal/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qcwcn/wifi_hal/Android.mk b/qcwcn/wifi_hal/Android.mk index 639ccdb..857f156 100644 --- a/qcwcn/wifi_hal/Android.mk +++ b/qcwcn/wifi_hal/Android.mk @@ -29,7 +29,7 @@ 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_CFLAGS += -Wno-implicit-fallthrough LOCAL_C_INCLUDES += \ $(LOCAL_PATH) \ @@ -94,7 +94,7 @@ endif 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_CFLAGS += -Wno-implicit-fallthrough LOCAL_C_INCLUDES += \ $(LOCAL_PATH) \ |