From 2cea7f94172102e9e3a374cc64a2149ac329fed5 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Tue, 19 Nov 2019 06:40:11 -0800 Subject: [PATCH] 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 --- target/product/base_system.mk | 2 +- target/product/go_defaults_common.mk | 1 - target/product/media_system.mk | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 6fbaf4ebf..1af367ae2 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -267,7 +267,7 @@ PRODUCT_PACKAGES += \ 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 5d4f5a575..ada339ac5 100644 --- a/target/product/go_defaults_common.mk +++ b/target/product/go_defaults_common.mk @@ -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. 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 86b2133d8..475393ffc 100644 --- a/target/product/media_system.mk +++ b/target/product/media_system.mk @@ -52,6 +52,7 @@ endif # 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 \