base_system.mk: Switch back to wifi-service.jar
Reason for revert: Wifi services no longer plan to be a separate
APK/process for mainline. Will instead become a jar loaded from Apex.
Bug: 144722612
Test: Device boots up & connects to wifi networks.
Change-Id: I80dd27aae3bb8de372c210d6d16adfcdd9458017
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 6fbaf4e..1af367a 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -267,7 +267,7 @@
vold \
WallpaperBackup \
watchdogd \
- InProcessWifiStack \
+ wifi-service \
wificond \
wm \
diff --git a/target/product/go_defaults_common.mk b/target/product/go_defaults_common.mk
index 5d4f5a5..ada339a 100644
--- a/target/product/go_defaults_common.mk
+++ b/target/product/go_defaults_common.mk
@@ -39,7 +39,6 @@
# Do not spin up a separate process for the network stack on go devices, use an in-process APK.
PRODUCT_PACKAGES += InProcessNetworkStack
-PRODUCT_PACKAGES += InProcessWifiStack
PRODUCT_PACKAGES += CellBroadcastAppPlatform
PRODUCT_PACKAGES += CellBroadcastServiceModulePlatform
diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 86b2133..475393f 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -52,6 +52,7 @@
# The order here is the same order they end up on the classpath, so it matters.
PRODUCT_SYSTEM_SERVER_JARS := \
services \
+ wifi-service \
ethernet-service \
com.android.location.provider \
service-jobscheduler \