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

Commit a7b36449 authored by Anton Hansson's avatar Anton Hansson
Browse files

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
parent dabf1a0c

target/product/base.mk

+2 −0
Original line number Diff line number Diff line
@@ -55,12 +55,14 @@ PRODUCT_PACKAGES += \ 
    charger \

    cmd \

    com.android.location.provider \

    ContactsProvider \

    content \

    crash_dump \

    CtsShimPrebuilt \

    CtsShimPrivPrebuilt \

    debuggerd\

    dnsmasq \

    DefaultContainerService \

    DownloadProvider \

    dpm \

    dumpstate \

target/product/core_minimal.mk

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ PRODUCT_PACKAGES += \ 
    com.android.media.remotedisplay \

    com.android.media.remotedisplay.xml \

    CompanionDeviceManager \

    ContactsProvider \

    DefaultContainerService \

    drmserver \

    ethernet-service \

    fsck.f2fs \

target/product/core_tiny.mk

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
#

# 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