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

Commit 22a70c43 authored by Anton Hansson's avatar Anton Hansson
Browse files

Remove embedded.mk 

The common mk files form a long chain of generic sounding names that
don't make much sense. For instance, embedded, base, core_minimal, core
and core_base all inherit each other, but there's no logical ordering
of these names.

The common mks will be split based on destination partition, which will
create many new files. Merging some of the common ones before this split
keeps the total number of mks under control.

There are only 2 products inheriting this mk excluding base.mk (which
has over 300 descendants). The other levels in the hierarchy all have
multiple device categories rooted at them (e.g. wearables from base.mk,
tvs and cars from core_minimal.mk), but embedded.mk has not which
makes it a compelling target to remove.

Bug: 80410283
Test: diff products variables with multiproduct_kati
Change-Id: I35c05973dfefefb7a31686476215386b8b89a557
parent 9dd91730

target/product/base.mk

+94 −3
Original line number Diff line number Diff line
@@ -17,11 +17,18 @@ 
PRODUCT_PACKAGES += \

    20-dns.conf \

    95-configured \

    adb \

    adbd \

    adbd.recovery \

    am \

    android.hardware.cas@1.0-service \

    android.hardware.configstore@1.1-service \

    android.hardware.media.omx@1.0-service \

    android.hidl.allocator@1.0-service \

    android.hidl.base-V1.0-java \

    android.hidl.manager-V1.0-java \

    android.hidl.memory@1.0-impl \

    android.hidl.memory@1.0-impl.vendor \

    android.policy \

    android.test.base \

    android.test.mock \
@@ -30,33 +37,47 @@ PRODUCT_PACKAGES += \ 
    appops \

    app_process \

    appwidget \

    atrace \

    audioserver \

    BackupRestoreConfirmation \

    bcc \

    bit \

    blank_screen \

    blkid \

    bmgr \

    bootanimation \

    bootstat \

    bpfloader \

    bu \

    bugreport \

    bugreportz \

    cameraserver \

    charger \

    cmd \

    com.android.location.provider \

    content \

    crash_dump \

    CtsShimPrebuilt \

    CtsShimPrivPrebuilt \

    debuggerd\

    dnsmasq \

    DownloadProvider \

    dpm \

    dumpstate \

    dumpsys \

    e2fsck \

    ExtServices \

    ExtShared \

    fastboot \

    framework \

    framework-res \

    framework-sysconfig.xml \

    fsck_msdos \

    gatekeeperd \

    gralloc.default \

    healthd \

    hid \

    hwservicemanager \

    idmap \

    ime \

    ims-common \
@@ -64,6 +85,9 @@ PRODUCT_PACKAGES += \ 
    incidentd \

    incident_helper \

    incident_report \

    init \

    init.environ.rc \

    init.rc \

    input \

    installd \

    ip \
@@ -72,8 +96,8 @@ PRODUCT_PACKAGES += \ 
    ip-up-vpn \

    javax.obex \

    keystore \

    ld.config.txt \

    ld.config.recovery.txt \

    ld.config.txt \

    ld.mc \

    libaaudio \

    libandroid \
@@ -83,11 +107,17 @@ PRODUCT_PACKAGES += \ 
    libaudioflinger \

    libaudiopolicymanager \

    libaudiopolicyservice \

    libbinder \

    libbundlewrapper \

    libc \

    libcamera2ndk \

    libcamera_client \

    libcameraservice \

    libclearkeycasplugin \

    libc_malloc_debug \

    libc_malloc_hooks \

    libcutils \

    libdl \

    libdownmix \

    libdrmclearkeyplugin \

    libdrmframework \
@@ -95,14 +125,26 @@ PRODUCT_PACKAGES += \ 
    libdynproc \

    libeffectproxy \

    libeffects \

    libEGL \

    libETC1 \

    libFFTEm \

    libfilterfw \

    libgatekeeper \

    libGLESv1_CM \

    libGLESv2 \

    libGLESv3 \

    libgui \

    libhardware \

    libhardware_legacy \

    libinput \

    libinputflinger \

    libiprouteutil \

    libjnigraphics \

    libjpeg \

    libkeystore \

    libldnhncr \

    liblog \

    libm \

    libmedia \

    libmedia_jni \

    libmediandk \
@@ -115,12 +157,15 @@ PRODUCT_PACKAGES += \ 
    libOpenMAXAL \

    libOpenSLES \

    libpdfium \

    libpixelflinger \

    libpower \

    libradio_metadata \

    libreference-ril \

    libreverbwrapper \

    libril \

    librtp_jni \

    libsensorservice \

    libsigchain \

    libskia \

    libsonic \

    libsonivox \
@@ -135,21 +180,32 @@ PRODUCT_PACKAGES += \ 
    libstagefright_foundation \

    libstagefright_omx \

    libstagefright_yuv \

    libstdc++ \

    libsurfaceflinger \

    libsurfaceflinger_ddmconnection \

    libsysutils \

    libui \

    libusbhost \

    libutils \

    libvisualizer \

    libvorbisidec \

    libvulkan \

    libwifi-service \

    libwilhelm \

    linker \

    linker.recovery \

    lmkd \

    locksettings \

    logcat \

    logd \

    lshal \

    mdnsd \

    media \

    media_cmd \

    media_profiles_V1_0.dtd \

    mediadrmserver \

    mediaextractor \

    mediametrics \

    media_profiles_V1_0.dtd \

    MediaProvider \

    mediaserver \

    mke2fs \
@@ -166,6 +222,7 @@ PRODUCT_PACKAGES += \ 
    pppd \

    privapp-permissions-platform.xml \

    racoon \

    recovery \

    resize2fs \

    run-as \

    schedtest \
@@ -173,24 +230,36 @@ PRODUCT_PACKAGES += \ 
    sdcard \

    secdiscard \

    SecureElement \

    selinux_policy \

    sensorservice \

    service \

    servicemanager \

    services \

    settings \

    SettingsProvider \

    sgdisk \

    Shell \

    shell_and_utilities \

    sm \

    statsd \

    storaged \

    surfaceflinger \

    svc \

    tc \

    telecom \

    telephony-common \

    thermalserviced \

    tombstoned \

    traced \

    traced_probes \

    tune2fs \

    tzdatacheck \

    uiautomator \

    uncrypt \

    usbd \

    vdc \

    vndservice \

    vndservicemanager \

    voip-common \

    vold \

    WallpaperBackup \
@@ -198,6 +267,20 @@ PRODUCT_PACKAGES += \ 
    wifi-service \

    wm \



# VINTF data

PRODUCT_PACKAGES += \

    device_compatibility_matrix.xml \

    device_manifest.xml \

    framework_manifest.xml \

    framework_compatibility_matrix.xml \



# AID Generation for

# <pwd.h> and <grp.h>

PRODUCT_PACKAGES += \

    passwd \

    group \

    fs_config_files \

    fs_config_dirs



ifeq ($(TARGET_CORE_JARS),)

$(error TARGET_CORE_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)
@@ -223,6 +306,12 @@ else 
PRODUCT_BOOT_JARS += org.apache.http.legacy.impl

endif



PRODUCT_COPY_FILES += \

    system/core/rootdir/init.usb.rc:root/init.usb.rc \

    system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \

    system/core/rootdir/ueventd.rc:root/ueventd.rc \

    system/core/rootdir/etc/hosts:system/etc/hosts



# Add the compatibility library that is needed when android.test.base

# is removed from the bootclasspath.

ifeq ($(REMOVE_ATB_FROM_BCP),true)
@@ -235,8 +324,11 @@ endif 
PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32



PRODUCT_SYSTEM_DEFAULT_PROPERTIES += debug.atrace.tags.enableflags=0



# Packages included only for eng or userdebug builds, previously debug tagged

PRODUCT_PACKAGES_DEBUG := \

    adb_keys \

    iotop \

    logpersist.start \

    micro_bench \
@@ -261,4 +353,3 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ 
    frameworks/base/config/dirty-image-objects:system/etc/dirty-image-objects)



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

target/product/embedded.mk

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

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

#



# This is a build configuration for a very minimal build of the

# Open-Source part of the tree.



PRODUCT_PACKAGES += \

    adb \

    adbd \

    adbd.recovery \

    usbd \

    android.hardware.configstore@1.1-service \

    android.hidl.allocator@1.0-service \

    android.hidl.memory@1.0-impl \

    android.hidl.memory@1.0-impl.vendor \

    atrace \

    blank_screen \

    bootanimation \

    bootstat \

    charger \

    cmd \

    crash_dump \

    debuggerd\

    dumpstate \

    dumpsys \

    fastboot \

    gralloc.default \

    healthd \

    hwservicemanager \

    init \

    init.environ.rc \

    init.rc \

    libEGL \

    libETC1 \

    libFFTEm \

    libGLESv1_CM \

    libGLESv2 \

    libGLESv3 \

    libbinder \

    libc \

    libc_malloc_debug \

    libc_malloc_hooks \

    libcutils \

    libdl \

    libgui \

    libhardware \

    libhardware_legacy \

    libjpeg \

    liblog \

    libm \

    libpixelflinger \

    libpower \

    libsigchain \

    libstdc++ \

    libsurfaceflinger \

    libsurfaceflinger_ddmconnection \

    libsysutils \

    libui \

    libutils \

    linker \

    linker.recovery \

    lmkd \

    logcat \

    lshal \

    recovery \

    service \

    servicemanager \

    shell_and_utilities \

    storaged \

    surfaceflinger \

    thermalserviced \

    tombstoned \

    tzdatacheck \

    vndservice \

    vndservicemanager \



# VINTF data

PRODUCT_PACKAGES += \

    device_compatibility_matrix.xml \

    device_manifest.xml \

    framework_manifest.xml \

    framework_compatibility_matrix.xml \



# SELinux packages are added as dependencies of the selinux_policy

# phony package.

PRODUCT_PACKAGES += \

    selinux_policy \



# AID Generation for

# <pwd.h> and <grp.h>

PRODUCT_PACKAGES += \

    passwd \

    group \

    fs_config_files \

    fs_config_dirs



# If there are product-specific adb keys defined, install them on debuggable

# builds.

PRODUCT_PACKAGES_DEBUG += \

    adb_keys



# Ensure that this property is always defined so that bionic_systrace.cpp

# can rely on it being initially set by init.

PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \

    debug.atrace.tags.enableflags=0



PRODUCT_COPY_FILES += \

    system/core/rootdir/init.usb.rc:root/init.usb.rc \

    system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \

    system/core/rootdir/ueventd.rc:root/ueventd.rc \

    system/core/rootdir/etc/hosts:system/etc/hosts