Merge changes from topic "wifi_mainline_apex"
* changes:
base_system.mk: Switch to wifi mainline apex
base_system.mk: Switch back to wifi-service.jar
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 6fbaf4e..1167716 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -46,6 +46,7 @@
bu \
bugreport \
bugreportz \
+ cacerts_wfa \
cgroups.json \
charger \
cmd \
@@ -60,6 +61,7 @@
com.android.resolv \
com.android.neuralnetworks \
com.android.tzdata \
+ com.android.wifi \
ContactsProvider \
content \
crash_dump \
@@ -267,7 +269,6 @@
vold \
WallpaperBackup \
watchdogd \
- InProcessWifiStack \
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..6ace361 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -62,7 +62,7 @@
# system server jars which are updated via apex modules.
# The values should be of the format <apex name>:<jar name>
PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
- # Ex: com.android.wifi:wifi-service
+ com.android.wifi:wifi-service
PRODUCT_COPY_FILES += \
system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt