From 291f7a5e05d200732bd402356d4ce8f106f03e66 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Thu, 10 Nov 2016 01:26:33 +0800
Subject: [PATCH] land: Inherit common Wi-Fi product component

Change-Id: I030e203880e046422340b5d1815e9a047ba93567
---
 device.mk            |  1 +
 product/qcom-wifi.mk | 18 ------------------
 product/wifi.mk      |  3 +++
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 product/qcom-wifi.mk
 create mode 100644 product/wifi.mk

diff --git a/device.mk b/device.mk
index a414803..841f1aa 100644
--- a/device.mk
+++ b/device.mk
@@ -30,6 +30,7 @@ include $(CM_PATH)/common/gps.mk
 include $(CM_PATH)/common/lights.mk
 include $(CM_PATH)/common/media.mk
 include $(CM_PATH)/common/snap.mk
+include $(CM_PATH)/common/wifi.mk
 
 # Include QCOM product fragments
 include $(CM_PATH)/qcom/audio.mk
diff --git a/product/qcom-wifi.mk b/product/qcom-wifi.mk
deleted file mode 100644
index ee5f106..0000000
--- a/product/qcom-wifi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Permissions
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
-    frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml
-
-# Properties
-PRODUCT_PROPERTY_OVERRIDES += \
-    wifi.interface=wlan0
-
-# Wi-Fi
-PRODUCT_PACKAGES += \
-    libqsap_sdk \
-    libwpa_client
-
-PRODUCT_PACKAGES += \
-    hostapd \
-    wpa_supplicant \
-    wpa_supplicant.conf
diff --git a/product/wifi.mk b/product/wifi.mk
new file mode 100644
index 0000000..918f67e
--- /dev/null
+++ b/product/wifi.mk
@@ -0,0 +1,3 @@
+# Properties
+PRODUCT_PROPERTY_OVERRIDES += \
+    wifi.interface=wlan0