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

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

Remove core.mk. 

It only has one mk inheriting it now, so it's redundant. Push its
packages into the single child (generic_no_telephony.mk).

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
parent f65e8066

target/product/AndroidProducts.mk

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ PRODUCT_MAKEFILES := \ 
    $(LOCAL_DIR)/aosp_x86_64.mk

else

PRODUCT_MAKEFILES := \

    $(LOCAL_DIR)/core.mk \

    $(LOCAL_DIR)/generic.mk \

    $(LOCAL_DIR)/generic_x86.mk \

    $(LOCAL_DIR)/aosp_arm.mk \

target/product/core.mk

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

# Copyright (C) 2007 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.

#



# Base configuration for communication-oriented android devices

# (phones, tablets, etc.).  If you want a change to apply to ALMOST ALL

# devices (including non-phones and non-tablets), modify

# core_minimal.mk instead. If you care about wearables, you need to modify

# core_tiny.mk in addition to core_minimal.mk.



PRODUCT_PACKAGES += \

    BasicDreams \

    BlockedNumberProvider \

    BookmarkProvider \

    Browser2 \

    BuiltInPrintService \

    Calendar \

    CalendarProvider \

    CaptivePortalLogin \

    CertInstaller \

    Contacts \

    DeskClock \

    DocumentsUI \

    DownloadProviderUi \

    Email \

    ExactCalculator \

    ExternalStorageProvider \

    FusedLocation \

    InputDevices \

    KeyChain \

    Keyguard \

    LatinIME \

    Launcher3QuickStep \

    ManagedProvisioning \

    MtpDocumentsProvider \

    PacProcessor \

    PrintSpooler \

    PrintRecommendationService \

    ProxyHandler \

    QuickSearchBox \

    SecureElement \

    Settings \

    SettingsIntelligence \

    SharedStorageBackup \

    SimAppDialog \

    StorageManager \

    Telecom \

    TeleService \

    Traceur \

    VpnDialogs \

    vr \

    MmsService



# The set of packages whose code can be loaded by the system server.

PRODUCT_SYSTEM_SERVER_APPS += \

    FusedLocation \

    InputDevices \

    KeyChain \

    Telecom \



# The set of packages we want to force 'speed' compilation on.

PRODUCT_DEXPREOPT_SPEED_APPS += \



$(call inherit-product, $(SRC_TARGET_DIR)/product/core_base.mk)

target/product/core_base.mk

+0 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.

#

# Note that components added here will be also shared in PDK. Components

# that should not be in PDK should be added in lower level like core.mk.



PRODUCT_PROPERTY_OVERRIDES := \

    ro.config.notification_sound=OnTheHunt.ogg \

target/product/core_minimal.mk

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


# Base configuration for most consumer android devices.  Do not put

# things that are specific to communication devices (phones, tables,

# etc.) here -- for that, use core.mk.

# etc.) here -- for that, use generic_no_telephony.mk.



PRODUCT_BRAND := generic

PRODUCT_DEVICE := generic

target/product/generic_no_telephony.mk

+65 −23
Original line number Diff line number Diff line
@@ -18,41 +18,83 @@ 
# It includes the base Android platform.



PRODUCT_PACKAGES := \

    audio.primary.default \

    BasicDreams \

    BlockedNumberProvider \

    Bluetooth \

    BluetoothMidiService \

    BookmarkProvider \

    Browser2 \

    BuiltInPrintService \

    Calendar \

    CalendarProvider \

    Camera2 \

    CaptivePortalLogin \

    CertInstaller \

    clatd \

    clatd.conf \

    Contacts \

    DeskClock \

    DisplayCutoutEmulationCornerOverlay \

    DisplayCutoutEmulationDoubleOverlay \

    DisplayCutoutEmulationTallOverlay \

    DocumentsUI \

    DownloadProviderUi \

    EasterEgg \

    Email \

    ExactCalculator \

    ExternalStorageProvider \

    FusedLocation \

    Gallery2 \

    InputDevices \

    KeyChain \

    Keyguard \

    LatinIME \

    Launcher3QuickStep \

    librs_jni \

    libvideoeditor_core \

    libvideoeditor_jni \

    libvideoeditor_osal \

    libvideoeditorplayer \

    libvideoeditor_videofilters \

    local_time.default \

    ManagedProvisioning \

    MmsService \

    MtpDocumentsProvider \

    Music \

    MusicFX \

    NfcNci \

    OneTimeInitializer \

    PacProcessor \

    power.default \

    PrintRecommendationService \

    PrintSpooler \

    Provision \

    ProxyHandler \

    QuickSearchBox \

    screenrecord \

    SecureElement \

    Settings \

    SettingsIntelligence \

    SharedStorageBackup \

    SimAppDialog \

    StorageManager \

    SystemUI \

    SysuiDarkThemeOverlay \

    DisplayCutoutEmulationDoubleOverlay \

    DisplayCutoutEmulationCornerOverlay \

    DisplayCutoutEmulationTallOverlay \

    EasterEgg \

    WallpaperCropper

    Telecom \

    TeleService \

    Traceur \

    vibrator.default \

    VpnDialogs \

    vr \

    WallpaperCropper \



PRODUCT_PACKAGES += \

    clatd \

    clatd.conf \

    screenrecord



PRODUCT_PACKAGES += \

    librs_jni \

    libvideoeditor_jni \

    libvideoeditor_core \

    libvideoeditor_osal \

    libvideoeditor_videofilters \

    libvideoeditorplayer \



PRODUCT_PACKAGES += \

    audio.primary.default \

    local_time.default \

    vibrator.default \

    power.default

PRODUCT_SYSTEM_SERVER_APPS += \

    FusedLocation \

    InputDevices \

    KeyChain \

    Telecom \



PRODUCT_COPY_FILES := \

        frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf
@@ -70,7 +112,7 @@ $(call inherit-product-if-exists, external/roboto-fonts/fonts.mk) 
$(call inherit-product-if-exists, external/hyphenation-patterns/patterns.mk)

$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)

$(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_base.mk)



# Overrides

PRODUCT_BRAND := generic