summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2019-04-24 14:34:10 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-24 14:34:10 -0700
commit80441c10e00eb4b73d53558aae124b27cf2e3660 (patch)
treec0a217b8a194d9fafe3e2db142acbbd75abac428
parent4f8fa4bb22aeba54f9dcacc66e94e40de26189d3 (diff)
parent846ffa32525aa691b15fbe940f113b7cf039b376 (diff)
downloadwlan-80441c10e00eb4b73d53558aae124b27cf2e3660.tar.gz
Merge "Disable -Wimplicit-fallthrough unless src is fixed."android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13
am: 846ffa3252 Change-Id: I6dcfe145b30a9ade2ac9ace40a2bb4cb406cdd62
-rw-r--r--qcwcn/wifi_hal/Android.mk4
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) \