product: Mainline wifi module
Move wifi services into a separate APK.
For now, the wifi stack will run inside system_server for all devices.
In the future, when the wifi stack becomes a mainline module:
For regular devices, the wifi stack will be loaded into
the network stack process - WifiStack.apk.
For GO (low memory) devices, the wifi stack will be always
loaded into system_server - InProcessWifiStack.apk.
Bug: 113174748
Change-Id: I1a272cbbb6a5284850177db41ec27a6f6035bb03
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 7a09ddb..aeb6fd6 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -189,7 +189,6 @@
libutils \
libvorbisidec \
libvulkan \
- libwifi-service \
libwilhelm \
linker \
linkerconfig \
@@ -273,8 +272,8 @@
vndkprivate.libraries.txt \
WallpaperBackup \
watchdogd \
+ InProcessWifiStack \
wificond \
- wifi-service \
wm \
# VINTF data for system image
diff --git a/target/product/go_defaults_common.mk b/target/product/go_defaults_common.mk
index aee7f47..bfb0317 100644
--- a/target/product/go_defaults_common.mk
+++ b/target/product/go_defaults_common.mk
@@ -39,6 +39,7 @@
# 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
# Strip the local variable table and the local variable type table to reduce
# the size of the system image. This has no bearing on stack traces, but will
diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 04cab45..f8e1b99 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -54,7 +54,6 @@
services \
jobscheduler-service \
ethernet-service \
- wifi-service \
com.android.location.provider \
PRODUCT_COPY_FILES += \