Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79ed0e6a authored Nov 26, 2019 by Roshan Pius Committed by Android (Google) Code Review Nov 26, 2019

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

parents 50b04489 8086a123

target/product/base_system.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ PRODUCT_PACKAGES += \
		bu \
		bugreport \
		bugreportz \
		cacerts_wfa \
		cgroups.json \
		charger \
		cmd \
		@@ -60,6 +61,7 @@ PRODUCT_PACKAGES += \
		com.android.resolv \
		com.android.neuralnetworks \
		com.android.tzdata \
		com.android.wifi \
		ContactsProvider \
		content \
		crash_dump \
		@@ -267,7 +269,6 @@ PRODUCT_PACKAGES += \
		vold \
		WallpaperBackup \
		watchdogd \
		InProcessWifiStack \
		wificond \
		wm \

target/product/go_defaults_common.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

target/product/media_system.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ PRODUCT_SYSTEM_SERVER_JARS := \
		# 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