From 32e70da517b0b18c6ef77b7ea1fee73c6033604a Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 18 Jun 2018 15:08:42 +0100 Subject: [PATCH] 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 Merged-In: I35c05973dfefefb7a31686476215386b8b89a557 Merged-In: I2e25032645c87f084f911e14fade16bc802ff457 --- target/product/base.mk | 100 +++++++++++++++++++++++++++++- target/product/embedded.mk | 124 ------------------------------------- 2 files changed, 98 insertions(+), 126 deletions(-) delete mode 100644 target/product/embedded.mk diff --git a/target/product/base.mk b/target/product/base.mk index 4664e4601..334e887bc 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -18,11 +18,18 @@ PRODUCT_PACKAGES += \ 20-dns.conf \ 95-configured \ + adb \ + adbd \ + adbd.recovery \ am \ android.hardware.cas@1.0-service \ + android.hardware.configstore@1.0-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.mock \ android.test.runner \ @@ -30,39 +37,56 @@ 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 \ incident \ incidentd \ incident_report \ + init \ + init.environ.rc \ + init.rc \ input \ installd \ ip \ @@ -71,8 +95,8 @@ PRODUCT_PACKAGES += \ ip-up-vpn \ javax.obex \ keystore \ - ld.config.txt \ ld.config.recovery.txt \ + ld.config.txt \ ld.mc \ libaaudio \ libandroid \ @@ -82,25 +106,43 @@ PRODUCT_PACKAGES += \ libaudioflinger \ libaudiopolicymanager \ libaudiopolicyservice \ + libbinder \ libbundlewrapper \ + libc \ libcamera2ndk \ libcamera_client \ libcameraservice \ libclearkeycasplugin \ + libc_malloc_debug \ + libc_malloc_hooks \ + libcutils \ + libdl \ libdownmix \ libdrmclearkeyplugin \ libdrmframework \ libdrmframework_jni \ 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 \ @@ -113,12 +155,15 @@ PRODUCT_PACKAGES += \ libOpenMAXAL \ libOpenSLES \ libpdfium \ + libpixelflinger \ + libpower \ libradio_metadata \ libreference-ril \ libreverbwrapper \ libril \ librtp_jni \ libsensorservice \ + libsigchain \ libskia \ libsonic \ libsonivox \ @@ -133,14 +178,25 @@ 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 \ @@ -164,29 +220,42 @@ PRODUCT_PACKAGES += \ pppd \ privapp-permissions-platform.xml \ racoon \ + recovery \ resize2fs \ run-as \ schedtest \ screencap \ sdcard \ secdiscard \ + selinux_policy \ sensorservice \ + service \ + servicemanager \ services \ settings \ SettingsProvider \ sgdisk \ Shell \ + shell_and_utilities \ sm \ + storaged \ + surfaceflinger \ svc \ tc \ telecom \ telephony-common \ + thermalserviced \ + tombstoned \ traced \ traced_probes \ tune2fs \ + tzdatacheck \ uiautomator \ uncrypt \ + usbd \ vdc \ + vndservice \ + vndservicemanager \ voip-common \ vold \ WallpaperBackup \ @@ -194,11 +263,39 @@ 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 +# and +PRODUCT_PACKAGES += \ + passwd \ + group \ + fs_config_files \ + fs_config_dirs + +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 + PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32 PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc +# 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 + # Packages included only for eng or userdebug builds, previously debug tagged PRODUCT_PACKAGES_DEBUG := \ + adb_keys \ iotop \ logpersist.start \ micro_bench \ @@ -223,4 +320,3 @@ PRODUCT_COPY_FILES += \ system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/embedded.mk) diff --git a/target/product/embedded.mk b/target/product/embedded.mk deleted file mode 100644 index 2a34639c6..000000000 --- a/target/product/embedded.mk +++ /dev/null @@ -1,124 +0,0 @@ -# -# 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.0-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 -# and -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