summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSumit Semwal <sumit.semwal@linaro.org>2018-07-27 10:22:58 +0530
committerSumit Semwal <sumit.semwal@linaro.org>2018-07-27 10:22:58 +0530
commit02ee0f58afd772856bfe97b2c9258e75ebd296e1 (patch)
tree94a751e232911d4112d49f0d1304e2ef4065c32a
parentd02043d01ad9eb9bebe9256f21654ffa8e277232 (diff)
downloaddragonboard410c-02ee0f58afd772856bfe97b2c9258e75ebd296e1.tar.gz
Use wpa_supplicant.conf from packages.
With latest aosp/master, on db820c, we saw some 'double define' issues around wpa_supplicant.conf. Work around that by using the packaged wpa_supplicant.conf instead. Change-Id: Iab9d28b323e99b8dcdc68dfcbb3aa4b1edcf78d6 Suggested-by: Amit Pundir <amit.pundir@linaro.org> Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
-rw-r--r--device-common.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/device-common.mk b/device-common.mk
index 0354d41..977a5d5 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -44,6 +44,7 @@ PRODUCT_PACKAGES += \
hostapd \
libwpa_client \
wpa_supplicant \
+ wpa_supplicant.conf \
wificond \
wifilogd
@@ -53,8 +54,7 @@ PRODUCT_PROPERTY_OVERRIDES := \
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
- frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
- device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf
+ frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml
# Enable BT
PRODUCT_PACKAGES += \