commit 58bfe6e15be780b779de7af5166e17f175ad8797
author Chih-hung Hsieh <chh@google.com> Wed Nov 08 06:45:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 08 06:45:05 2017 +0000
tree ab8d4259363f11c8912ef31315336f0d091d1d82
parent 6caadf281d923c036a6385a752dbeca026dd8948
parent b6559054998cc816d8755eef948fce4d27ec5341

Merge "Revert "Use -Werror in hardware/broadcom/wlan/bcmdhd""
am: b655905499

Change-Id: Ib01d3f262d79c15c6a3662e60e9c3610fe2cdd85

bcmdhd/dhdutil/Android.mk

diff --git a/bcmdhd/dhdutil/Android.mk b/bcmdhd/dhdutil/Android.mk
index c3a5614..4294413 100644
--- a/bcmdhd/dhdutil/Android.mk
+++ b/bcmdhd/dhdutil/Android.mk
@@ -30,7 +30,6 @@
 ifeq ($(TARGET_ARCH),arm)
 LOCAL_CFLAGS += -mabi=aapcs-linux
 endif
-LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter
 LOCAL_C_INCLUDES +=$(LOCAL_PATH)/include
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)

bcmdhd/wifi_hal/Android.mk

diff --git a/bcmdhd/wifi_hal/Android.mk b/bcmdhd/wifi_hal/Android.mk
index 2db5f17..9e4ed08 100644
--- a/bcmdhd/wifi_hal/Android.mk
+++ b/bcmdhd/wifi_hal/Android.mk
@@ -18,14 +18,7 @@
 # ============================================================
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS := \
-    -Wall \
-    -Werror \
-    -Wno-reorder \
-    -Wno-unused-function \
-    -Wno-unused-parameter \
-    -Wno-unused-private-field \
-    -Wno-unused-variable \
+LOCAL_CFLAGS := -Wno-unused-parameter
 
 LOCAL_C_INCLUDES += \
 	external/libnl/include \

bcmdhd/wpa_supplicant_8_lib/Android.mk

diff --git a/bcmdhd/wpa_supplicant_8_lib/Android.mk b/bcmdhd/wpa_supplicant_8_lib/Android.mk
index db350cf..c1d3c34 100644
--- a/bcmdhd/wpa_supplicant_8_lib/Android.mk
+++ b/bcmdhd/wpa_supplicant_8_lib/Android.mk
@@ -60,8 +60,6 @@
 L_CFLAGS += -DBCMDHD_64_BIT_IPC
 endif
 
-L_CFLAGS += -Wall -Werror -Wno-unused-parameter -Wno-macro-redefined
-
 ########################
 
 include $(CLEAR_VARS)