From a7b36449eb9a206390fcce1e09ebebd5d66313f8 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 19 Jun 2018 15:04:34 +0100
Subject: [PATCH] Delete core_tiny.mk

There are no descendants of this mk in AOSP. Move the content that was
shared with core_minimal.mk to base.mk (ContactsProvider and
DefaultContainerService)

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    | 80 ----------------------------------
 3 files changed, 2 insertions(+), 82 deletions(-)
 delete mode 100644 target/product/core_tiny.mk

diff --git a/target/product/base.mk b/target/product/base.mk
index 334e887bc6..d65f124441 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -55,12 +55,14 @@ PRODUCT_PACKAGES += \
     charger \
     cmd \
     com.android.location.provider \
+    ContactsProvider \
     content \
     crash_dump \
     CtsShimPrebuilt \
     CtsShimPrivPrebuilt \
     debuggerd\
     dnsmasq \
+    DefaultContainerService \
     DownloadProvider \
     dpm \
     dumpstate \
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 910d796a28..1faeffa8ee 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 \
     fsck.f2fs \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
deleted file mode 100644
index 0ec475bdc7..0000000000
--- a/target/product/core_tiny.mk
+++ /dev/null
@@ -1,80 +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 \
-    logd \
-    nullwebview \
-    power.default \
-    pppd \
-
-
-ifeq ($(TARGET_CORE_JARS),)
-$(error TARGET_CORE_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)
-endif
-
-# The order matters
-PRODUCT_BOOT_JARS := \
-    $(TARGET_CORE_JARS) \
-    legacy-test \
-    ext \
-    framework \
-    telephony-common \
-    voip-common \
-    ims-common \
-    nullwebview \
-    org.apache.http.legacy.impl \
-    android.hidl.base-V1.0-java \
-    android.hidl.manager-V1.0-java
-
-# The order of PRODUCT_SYSTEM_SERVER_JARS 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 \
-    SettingsProvider \
-    WallpaperBackup \
-
-# 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