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

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

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

target/product/base.mk

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

    cmd \

    com.android.location.provider \

    ContactsProvider \

    content \

    crash_dump \

    CtsShimPrebuilt \

    CtsShimPrivPrebuilt \

    debuggerd\

    DefaultContainerService \

    dnsmasq \

    DownloadProvider \

    dpm \

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 \

    HTMLViewer \

target/product/core_tiny.mk

deleted100644 → 0
+0 −57
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 \

    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