commit 7c79d9d1faf25413d5bd51bf56bfb04794083ac5
author Sunil Ravi <sunilravi@google.com> Mon Sep 28 15:45:00 2020 +0000
committer Ahmed ElArabawy <arabawy@google.com> Tue Sep 29 17:17:39 2020 +0000
tree 2e58a17203c25e55ce5b2be7bce0b5d8e2b4ff5b
parent b0f4d54f335fc8155b1bc6ba33811d17801fdd8c

Revert "Fix defining FEATURE_UPDATE_STA_MAC_ADDR"

This reverts commit f05f8e08b9f7abe8a70ff747540da479f7d530c8.

Reason for revert: Adding new implementation to update mac address
                   through ag/12687361

Bug:149448388
Test: Manual -  Connect - Disconnect multiple times.

Change-Id: Ie997068ba9477f2140b8a3bdcfa3f8d9dbebae8e
Merged-In: I49b7eb261d6276113d9c69a28f4ffaec37d13ca7

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index ed20fb3..b440497 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -16,6 +16,10 @@
   CONFIG_DRIVER_NL80211_QCA=y
 endif
 
+ifeq ($(WIFI_UPDATE_SUPPLICANT_MAC_ADDR), enabled)
+  FEATURE_UPDATE_STA_MAC_ADDR=y
+endif
+
 include $(LOCAL_PATH)/android.config
 
 # To ignore possible wrong network configurations
@@ -68,10 +72,6 @@
 L_CFLAGS += -DCONFIG_NO_ROAMING
 endif
 
-ifeq ($(WIFI_UPDATE_SUPPLICANT_MAC_ADDR), enabled)
-L_CFLAGS += -DFEATURE_UPDATE_STA_MAC_ADDR
-endif
-
 # Use Android specific directory for control interface sockets
 L_CFLAGS += -DCONFIG_CTRL_IFACE_CLIENT_DIR=\"/data/vendor/wifi/wpa/sockets\"
 L_CFLAGS += -DCONFIG_CTRL_IFACE_DIR=\"/data/vendor/wifi/wpa/sockets\"