From 5ee2173c05e8c8bf35abc902eebd958db83ac1b0 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Thu, 1 Apr 2021 10:17:00 +0100 Subject: [PATCH] Remove com.android.geotz jar from system server This commit removes the com.android.geotz apex from the build. This apex is associated with the "offline" location time zone provider from the nascent com.android.geotz module, which has been configured as the "secondary" provider. This module will not to be updatable in S so needs to be removed before release. This is effectively a revert of commit 6009a0a38f63a1b632f21df5827af1d4d03ae1ab. Bug: 178169250 Bug: 172546738 Test: treehugger Change-Id: I734388383030984d5c3e7a1373a77da013a6cb8e --- target/product/base_system.mk | 1 - target/product/default_art_config.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 50f1fb5f7f..8be703c46d 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -54,7 +54,6 @@ PRODUCT_PACKAGES += \ com.android.conscrypt \ com.android.cronet \ com.android.extservices \ - com.android.geotz \ com.android.i18n \ com.android.ipsec \ com.android.location.provider \ diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk index a93e573710..0fa9058f0b 100644 --- a/target/product/default_art_config.mk +++ b/target/product/default_art_config.mk @@ -70,7 +70,6 @@ PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \ com.android.appsearch:service-appsearch \ com.android.media:service-media-s \ com.android.permission:service-permission \ - com.android.geotz:geotz # Minimal configuration for running dex2oat (default argument values). # PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.