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

Commit 8e72cc36 authored Jun 30, 2021 by Neil Fuller Committed by Automerger Merge Worker Jun 30, 2021

Merge "Remove com.android.geotz jar from system server" into sc-dev am: 59b80b91 am: 27dacbc5

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14112924

Change-Id: I17e20b07d4afbf840d7360ccd29864f4107efab8

parents 0b80ac38 27dacbc5

target/product/base_system.mk

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,6 @@ PRODUCT_PACKAGES += \
	com.android.conscrypt \		com.android.conscrypt \
	com.android.cronet \		com.android.cronet \
	com.android.extservices \		com.android.extservices \
	com.android.geotz \
	com.android.i18n \		com.android.i18n \
	com.android.ipsec \		com.android.ipsec \
	com.android.location.provider \		com.android.location.provider \

target/product/default_art_config.mk

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,6 @@ PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
	com.android.art:service-art \		com.android.art:service-art \
	com.android.media:service-media-s \		com.android.media:service-media-s \
	com.android.permission:service-permission \		com.android.permission:service-permission \
	com.android.geotz:geotz

	# Minimal configuration for running dex2oat (default argument values).		# Minimal configuration for running dex2oat (default argument values).
	# PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.		# PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.