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
This commit is contained in:
Roshan Pius
2019-11-19 06:40:11 -08:00
parent 190b955f87
commit 2cea7f9417
3 changed files with 2 additions and 2 deletions

View File

@@ -267,7 +267,7 @@ PRODUCT_PACKAGES += \
vold \ vold \
WallpaperBackup \ WallpaperBackup \
watchdogd \ watchdogd \
InProcessWifiStack \ wifi-service \
wificond \ wificond \
wm \ wm \

View File

@@ -39,7 +39,6 @@ PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false
# Do not spin up a separate process for the network stack on go devices, use an in-process APK. # Do not spin up a separate process for the network stack on go devices, use an in-process APK.
PRODUCT_PACKAGES += InProcessNetworkStack PRODUCT_PACKAGES += InProcessNetworkStack
PRODUCT_PACKAGES += InProcessWifiStack
PRODUCT_PACKAGES += CellBroadcastAppPlatform PRODUCT_PACKAGES += CellBroadcastAppPlatform
PRODUCT_PACKAGES += CellBroadcastServiceModulePlatform PRODUCT_PACKAGES += CellBroadcastServiceModulePlatform

View File

@@ -52,6 +52,7 @@ endif
# The order here is the same order they end up on the classpath, so it matters. # The order here is the same order they end up on the classpath, so it matters.
PRODUCT_SYSTEM_SERVER_JARS := \ PRODUCT_SYSTEM_SERVER_JARS := \
services \ services \
wifi-service \
ethernet-service \ ethernet-service \
com.android.location.provider \ com.android.location.provider \
service-jobscheduler \ service-jobscheduler \