From 552dcaf7d9c61b04f211a8ee466b1881b6f4b1a2 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 19 Jun 2018 14:57:39 +0100 Subject: [PATCH] Delete core_tiny.mk Only inherited by a single mk, so inline its contents there, with a few exceptions: - pppd was redundant (already in base) - ContactsProvider and DefaultContainerService were duped in base.mk's only two children (core_tiny and core_minimal) Bug: 80410283 Test: diff product variables with multiproduct_kati Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96 Merged-In: I95431b3db789e9c347bb37109a3ac7f627025f96 --- target/product/base.mk | 2 ++ target/product/core_minimal.mk | 2 -- target/product/core_tiny.mk | 57 ---------------------------------- 3 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 target/product/core_tiny.mk diff --git a/target/product/base.mk b/target/product/base.mk index 35cb0e29c7..dd102c1b60 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -55,11 +55,13 @@ PRODUCT_PACKAGES += \ charger \ cmd \ com.android.location.provider \ + ContactsProvider \ content \ crash_dump \ CtsShimPrebuilt \ CtsShimPrivPrebuilt \ debuggerd\ + DefaultContainerService \ dnsmasq \ DownloadProvider \ dpm \ diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index 811fccdcca..8f21517949 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -28,8 +28,6 @@ PRODUCT_PACKAGES += \ com.android.media.remotedisplay \ com.android.media.remotedisplay.xml \ CompanionDeviceManager \ - ContactsProvider \ - DefaultContainerService \ drmserver \ ethernet-service \ HTMLViewer \ diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk deleted file mode 100644 index d64e08f821..0000000000 --- a/target/product/core_tiny.mk +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2013 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Tiny configuration for small devices such as wearables. Includes base and embedded. -# No telephony - -PRODUCT_PACKAGES := \ - audio.primary.default \ - Bluetooth \ - CalendarProvider \ - CertInstaller \ - clatd \ - clatd.conf \ - ContactsProvider \ - DefaultContainerService \ - FusedLocation \ - InputDevices \ - local_time.default \ - power.default \ - pppd \ - -# The order here is the same order they end up on the classpath, so it matters. -PRODUCT_SYSTEM_SERVER_JARS := \ - services \ - wifi-service - -# The set of packages whose code can be loaded by the system server. -PRODUCT_SYSTEM_SERVER_APPS += \ - FusedLocation \ - InputDevices - -# The set of packages we want to force 'speed' compilation on. -PRODUCT_DEXPREOPT_SPEED_APPS := \ - -PRODUCT_PROPERTY_OVERRIDES += \ - ro.carrier=unknown - -$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk) -$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk) -$(call inherit-product-if-exists, external/roboto-fonts/fonts.mk) - -# Overrides -PRODUCT_BRAND := tiny -PRODUCT_DEVICE := tiny -PRODUCT_NAME := core_tiny