commit 60993ad6913845a074cfb651626b775eca1f10f7
author Xin Li <delphij@google.com> Fri Jul 20 01:21:21 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jul 20 01:21:21 2018 -0700
tree 838540d8bcdfc8e986a9dc46415a7737eb1901df
parent 19205d48dcbba0ae7a0726db617c3ba9d6c98c7a
parent 14f319fa82f5516623c8fe3aa654f657c283312e

Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master am: d61106ff55
am: 14f319fa82

Change-Id: Ibc76de3e50691ea3a61f79831b3878aec4b0a2f1

OWNERS

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..6542bef
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+dimitrysh@google.com
+etancohen@google.com
+rpius@google.com

src/eap_peer/eap_proxy_qmi_oc.c

diff --git a/src/eap_peer/eap_proxy_qmi_oc.c b/src/eap_peer/eap_proxy_qmi_oc.c
index 4c07da5..9fcf512 100644
--- a/src/eap_peer/eap_proxy_qmi_oc.c
+++ b/src/eap_peer/eap_proxy_qmi_oc.c
@@ -32,7 +32,7 @@
 
 #ifdef CONFIG_EAP_PROXY
 #include "qmi_client.h"
-#include "eap_proxy_qmi.h"
+#include "eap_proxy_qmi_oc.h"
 #include "qmi_client.h"
 #include "qmi_idl_lib.h"
 #include "authentication_service_v01.h"

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index d57446c..f556a6d 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -12,6 +12,10 @@
   CONFIG_DRIVER_$(BOARD_WPA_SUPPLICANT_DRIVER) := y
 endif
 
+ifeq ($(BOARD_WLAN_DEVICE), qcwcn)
+  CONFIG_DRIVER_NL80211_QCA=y
+endif
+
 include $(LOCAL_PATH)/android.config
 
 # To ignore possible wrong network configurations

wpa_supplicant/android.config

diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config
index fd65584..f39c1ba 100644
--- a/wpa_supplicant/android.config
+++ b/wpa_supplicant/android.config
@@ -32,9 +32,6 @@
 #CONFIG_DRIVER_NL80211=y
 CONFIG_LIBNL20=y
 
-# QCA vendor extensions to nl80211
-CONFIG_DRIVER_NL80211_QCA=y
-
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y
 #CFLAGS += -I/usr/local/include