Merge "Disable macro redefined warnings."
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index ec2d55a..f177c16 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -27,6 +27,9 @@
# Disable unused parameter warnings
L_CFLAGS += -Wno-unused-parameter
+# Disable macro redefined warnings
+L_CFLAGS += -Wno-macro-redefined
+
# Set Android extended P2P functionality
L_CFLAGS += -DANDROID_P2P
@@ -152,7 +155,6 @@
OBJS += src/eapol_auth/eapol_auth_sm.c
-
ifndef CONFIG_NO_DUMP_STATE
# define HOSTAPD_DUMP_STATE to include support for dumping internal state
# through control interface commands (undefine it, if you want to save in
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 71e08e7..3f42fe4 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -25,6 +25,9 @@
# Disable unused parameter warnings
L_CFLAGS += -Wno-unused-parameter
+# Disable redefined macro warnings
+L_CFLAGS += -Wno-macro-redefined
+
# Set Android extended P2P functionality
L_CFLAGS += -DANDROID_P2P