Merge "Add wificond to Android makefiles" into oc-dr1-dev
diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index 03d33e1..e0a20b8 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -60,6 +60,10 @@
libwebrtc_audio_preprocessing \
mdnsd \
requestsync \
- wifi-service
+
+# Wifi modules
+PRODUCT_PACKAGES += \
+ wifi-service \
+ wificond \
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 5a18c70..9ea9a5a 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -88,7 +88,11 @@
voip-common \
webview \
webview_zygote \
- wifi-service
+
+# Wifi modules
+PRODUCT_PACKAGES += \
+ wifi-service \
+ wificond \
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.webview.xml:system/etc/permissions/android.software.webview.xml
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index e9920f2..f19009c 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -83,7 +83,11 @@
telephony-common \
voip-common \
logd \
- wifi-service
+
+# Wifi modules
+PRODUCT_PACKAGES += \
+ wifi-service \
+ wificond \
# The order matters
PRODUCT_BOOT_JARS := \
diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk
index d5366d9..ebedb3f 100644
--- a/target/product/treble_common.mk
+++ b/target/product/treble_common.mk
@@ -189,12 +189,6 @@
PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/bootdevice/by-name/system
-# Wifi:
-# Wifi HAL (android.hardware.wifi@1.0-service, wpa_supplicant,
-# and wpa_supplicant.conf) is not here. They are in vendor.img
-PRODUCT_PACKAGES += \
- wificond \
-
# Audio:
USE_XML_AUDIO_POLICY_CONF := 1
# The following policy XML files are used as fallback for