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

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

Remove core_base.mk 

It's small, and doesn't really have a theme so it doesn't really warrant
its own build file. Inline its contents in all its children.

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I7db95f9134df36ebd0271e21dba1fa13b28afc72
parent a314fc01

target/product/core_base.mk

deleted100644 → 0
+0 −26
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.

#



PRODUCT_PROPERTY_OVERRIDES := \

    ro.config.notification_sound=OnTheHunt.ogg \

    ro.config.alarm_alert=Alarm_Classic.ogg



PRODUCT_PACKAGES += \

    Home \

    TelephonyProvider \

    UserDictionaryProvider \



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

target/product/generic_no_telephony.mk

+7 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ PRODUCT_PACKAGES := \ 
    ExternalStorageProvider \

    FusedLocation \

    Gallery2 \

    Home \

    InputDevices \

    KeyChain \

    Keyguard \
@@ -79,9 +80,11 @@ PRODUCT_PACKAGES := \ 
    SystemUI \

    SysuiDarkThemeOverlay \

    Telecom \

    TelephonyProvider \

    TeleService \

    Traceur \

    vibrator.default \

    UserDictionaryProvider \

    VpnDialogs \

    vr \

    WallpaperCropper \
@@ -97,7 +100,9 @@ PRODUCT_COPY_FILES := \ 
        frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf



PRODUCT_PROPERTY_OVERRIDES += \

    ro.carrier=unknown

    ro.carrier=unknown \

    ro.config.notification_sound=OnTheHunt.ogg \

    ro.config.alarm_alert=Alarm_Classic.ogg



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

$(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)
@@ -109,7 +114,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_base.mk)

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



# Overrides

PRODUCT_BRAND := generic