diff options
Diffstat (limited to 'system_image/Android.bp')
| -rw-r--r-- | system_image/Android.bp | 1251 |
1 files changed, 472 insertions, 779 deletions
diff --git a/system_image/Android.bp b/system_image/Android.bp index db91323f3..83dc891e7 100644 --- a/system_image/Android.bp +++ b/system_image/Android.bp @@ -56,434 +56,17 @@ android_symlinks = [ target: "/system_dlkm/lib/modules", name: "system/lib/modules", }, - { - target: "/apex/com.android.tethering/bin/ethtool", - name: "system/bin/ethtool", - }, ] -android_system_image { - name: "aosp_cf_system_x86_64", - use_avb: true, - avb_private_key: ":microdroid_sign_key", - avb_algorithm: "SHA256_RSA4096", - avb_hash_algorithm: "sha256", - partition_name: "system", - deps: [ - "abb", - "abx", - "abx2xml", - "aconfigd", - "adb_debug.prop", - "adevice_fingerprint", - "aflags", - "aidl_lazy_cb_test_server", - "aidl_lazy_test_server", - "am", - "android_build_prop", - "android_vintf_manifest", - "android.hardware.audio.common-util", - "android.hardware.audio.common-V3-ndk", - "android.hardware.audio.common@5.0-util", - "android.hardware.audio.common@5.0", - "android.hardware.audio.common@6.0-util", - "android.hardware.audio.common@6.0", - "android.hardware.audio.core-V2-ndk", - "android.hardware.audio.core.sounddose-V2-ndk", - "android.hardware.audio.effect-V2-ndk", - "android.hardware.audio.effect.service-aidl.example", - "android.hardware.audio.effect@5.0-util", - "android.hardware.audio.effect@5.0", - "android.hardware.audio.effect@6.0-util", - "android.hardware.audio.effect@6.0", - "android.hardware.audio.effect@7.0-impl", - "android.hardware.audio.service-aidl.example", - "android.hardware.audio@5.0-util", - "android.hardware.audio@5.0", - "android.hardware.audio@6.0-util", - "android.hardware.audio@6.0", - "android.hardware.biometrics.fingerprint@2.1", - "android.hardware.bluetooth.audio-impl", - "android.hardware.boot-service.default_recovery", - "android.hardware.common.fmq-V1-ndk", - "android.hardware.fastboot@1.1-impl-mock", - "android.hardware.graphics.allocator-service.minigbm", - "android.hardware.graphics.mapper@4.0-impl.minigbm", - "android.hardware.health-service.cuttlefish_recovery", - "android.hardware.health-V2-ndk", - "android.hardware.health-V3-ndk", - "android.hardware.power.stats-V1-cpp", - "android.hardware.radio.config@1.0", - "android.hardware.radio.deprecated@1.0", - "android.hardware.radio@1.0", - "android.hardware.radio@1.1", - "android.hardware.radio@1.2", - "android.hardware.radio@1.3", - "android.hardware.radio@1.4", - "android.hardware.secure_element@1.0", - "android.hardware.security.secretkeeper-service.nonsecure", - "android.hidl.allocator@1.0-service", - "android.hidl.memory.token@1.0", - "android.hidl.memory@1.0", - "android.hidl.safe_union@1.0", - "android.media.audio.common.types-V3-ndk", - "android.system.suspend-service", +phony { + name: "fonts", + required: [ "AndroidClock.ttf", - "apexd", - "app_process", - "appops", - "appwidget", - "arping", - "atrace", - "audio.primary.default", - "audioserver", - "auditctl", - "av-audio-types-aidl-V1-ndk", - "avbctl", - "awk", - "bc", - "bcc", - "blank_screen", - "blkid", - "bmgr", - "bootanimation", - "bootctl", - "bootstat", - "boringssl_self_test", - "bpfloader", - "bu", - "bugreport_procdump", - "bugreport", - "bugreportz", - "bzip2", - "cacerts", - "cameraserver", "CarroisGothicSC-Regular.ttf", - "cgroups.json", - "cgroups.recovery.json", - "checkpoint_gc", - "cmd", "ComingSoon.ttf", - "content", - "cppreopts.sh", - "credstore", "CutiveMono.ttf", - "cuttlefish_sensor_injection", "DancingScript-Regular.ttf", - "debuggerd", - "device_config", - "dirty-image-objects", - "dlkm_loader", - "dmabuf_dump", - "dmctl", - "dmesgd", - "dmuserd", - "dnsmasq", - "dpm", "DroidSansMono.ttf", - "dump.erofs", - "dumpstate", - "dumpsys_vendor", - "dumpsys", - "e2freefrag", - "e2fsck", - "e2fsdroid", - "etc_hosts", - "evemu-record", - "extra_free_kbytes", - "fastbootd", - "flags_health_check", - "font_fallback.xml", - "fonts.xml", - "framework-sysconfig.xml", - "fsck_msdos", - "fsck.erofs", - "fsck.exfat", - "fsck.f2fs", - "fstab.cf.ext4.cts", - "fstab.cf.ext4.hctr2", - "fstab.cf.f2fs.cts", - "fstab.cf.f2fs.hctr2", - "fstab.postinstall", - "fsverity_init", - "fsverity-release-cert-der", - "gatekeeperd", - "gpu_counter_producer", - "gpuservice", - "group_odm", - "group_product", - "group_system_ext", - "group_system", - "group_vendor", - "gsi_tool", - "gsid", - "heapprofd_client", - "heapprofd", - "hid", - "hiddenapi-package-whitelist.xml", - "hidl_lazy_cb_test_server", - "hidl_lazy_test_server", - "hwservicemanager", - "idlcli", - "idmap2", - "idmap2d", - "ime", - "incident_helper", - "incident-helper-cmd", - "incident", - "incidentd", - "init-debug.rc", - "init_first_stage", - "init.boringssl.zygote64_32.rc", - "init.boringssl.zygote64.rc", - "init.rc", - "init.usb.configfs.rc", - "init.usb.rc", - "init.zygote32.rc", - "init.zygote64_32.rc", - "init.zygote64.rc", - "initial-package-stopped-states-aosp.xml", - "initial-package-stopped-states.xml", - "input", - "installd", - "iotop", - "ip", - "iperf3", - "iptables", - "iw", - "kcmdlinectrl", - "keystore_cli_v2", - "keystore2", - "layertracegenerator", - "ld.config.recovery.txt", - "ld.mc", - "ldd", - "lib_renderControl_enc", - "libaaudio", - "libadbd_auth", - "libadbd_fs", - "libalarm_jni", - "libamidi", - "libandroid_runtime", - "libandroid_servers", - "libandroid", - "libandroidemu", - "libandroidfw", - "libartpalette-system", - "libasyncio", - "libasyncio", - "libaudio_aidl_conversion_common_ndk_cpp", - "libaudio_aidl_conversion_common_ndk", - "libaudio_aidl_conversion_common_ndk", - "libaudio_aidl_conversion_core_ndk", - "libaudio_aidl_conversion_effect_ndk", - "libaudio-resampler", - "libaudioaidlcommon", - "libaudioaidlcommon", - "libaudioeffect_jni", - "libaudiohal_deathhandler", - "libaudiohal", - "libaudiohal@5.0", - "libaudiohal@6.0", - "libaudiohal@7.0", - "libaudiohal@7.1", - "libaudiohal@aidl", - "libaudiopolicyengineconfigurable", - "libaudiopreprocessing", - "libaudioutils", - "libaudioutils", - "libbinder_ndk", - "libbinder_rpc_unstable", - "libbinder", - "libblas", - "libbootloader_message", - "libbundlewrapper", - "libcamera2ndk", - "libclang_rt.asan", - "libclcore_debug_g.bc", - "libclcore_debug.bc", - "libclcore_g.bc", - "libclcore.bc", - "libclearkeycasplugin", - "libcompiler_rt", - "libcrypto_utils", - "libcups", - "libcutils", - "libdmabufheap", - "libdmabufheap", - "libdownmix", - "libdrm", - "libdrm", - "libdrm", - "libdrmclearkeyplugin", - "libdrmframework_jni", - "libdrmframework", - "libdynproc", - "libeffectproxy", - "libeffects", - "libeffectsconfig", - "libeffectsconfig", - "libEGL_angle", - "libEGL_emulation", - "libEGL", - "libepoxy", - "libETC1", - "libext4_utils", - "libfdtrack", - "libfec", - "libFFTEm", - "libfilterfw", - "libfilterpack_imageproc", - "libfmq", - "libfs_mgr", - "libfwdlockengine", - "libgatekeeper", - "libgbm", - "libGLESv1_CM_angle", - "libGLESv1_CM_emulation", - "libGLESv1_CM", - "libGLESv1_enc", - "libGLESv2_angle", - "libGLESv2_emulation", - "libGLESv2_enc", - "libGLESv2", - "libGLESv3", - "libgralloctypes", - "libgsi", - "libgui", - "libhapticgenerator", - "libhardware_legacy", - "libhardware", - "libhidcommand_jni", - "libhidlmemory", - "libhidlmemory", - "libhidltransport", - "libhwbinder", - "libincident", - "libinput", - "libinputflinger", - "libiprouteutil", - "libjni_deviceAsWebcam", - "libjnigraphics", - "libjpeg", - "libldnhncr", - "liblockagent", - "liblog", - "liblogwrap", - "liblp", - "liblz4", - "libmedia_helper", - "libmedia_helper", - "libmedia_jni", - "libmedia", - "libmediandk", - "libmediaplayerservice", - "libmediautils_delayed", - "libminui", - "libmtp", - "libnativewindow", - "libnetd_client", - "libnetlink", - "libnetutils", - "libneuralnetworks_packageinfo", - "libnfc_nci_jni", - "libnl", - "libOpenglCodecCommon", - "libOpenglSystemCommon", - "libOpenMAXAL", - "libOpenSLES", - "libpdfium", - "libperfetto_android_internal", - "libpolicy-subsystem", - "libpower", - "libpowermanager", - "libprintspooler_jni", - "libprocessgroup_setup", - "libprotobuf-cpp-full", - "libradio_metadata", - "librank", - "libresourcemanagerservice", - "libreverbwrapper", - "libRS_internal", - "librs_jni", - "libRSCacheDir", - "libRSCpuRef", - "libRSDriver", - "librtp_jni", - "libsensorservice", - "libsfplugin_ccodec", - "libskia", - "libsonic", - "libsonivox", - "libsoundpool", - "libspeexresampler", - "libspeexresampler", - "libspeexresampler", - "libsqlite", - "libsquashfs_utils", - "libssl", - "libstagefright_foundation", - "libstagefright_foundation", - "libstagefright_foundation", - "libstagefright_httplive", - "libstagefright_omx", - "libstagefright", - "libstdc++", - "libsync", - "libsysutils", - "libtinyxml2", - "libtombstoned_client", - "libtracingproxy", - "libui", - "libuinputcommand_jni", - "libukey2_jni_shared", - "libusbhost", - "libutils", - "libvendorsupport", - "libvintf_jni", - "libvirglrenderer", - "libvisualizer", - "libvulkan", - "libwebviewchromium_loader", - "libwebviewchromium_plat_support", - "libwfds", - "libwilhelm", - "libxml2", - "libxml2", - "linker", - "llkd", - "lmkd", - "local_time.default", - "lockagent_crasher", - "locksettings", - "logcat", - "logcatd", - "logd", - "logpersist.start", - "logtagd.rc", - "logwrapper", - "lpdump", - "lpdumpd", - "lshal", - "make_f2fs", - "mapper.minigbm", - "mdnsd", - "mediacodec.policy", - "mediaextractor", - "mediametrics", - "migrate_legacy_obb_data", - "mini-keyctl", - "misctrl", - "mke2fs", - "mkfs.erofs", - "mkfs.exfat", - "mm_events", - "monkey", - "mtectrl", - "ndc", - "netd", - "netutils-wrapper-1.0", - "newfs_msdos", "NotoColorEmoji.ttf", "NotoColorEmojiFlags.ttf", "NotoColorEmojiLegacy.ttf", @@ -506,13 +89,13 @@ android_system_image { "NotoSansBrahmi-Regular.ttf", "NotoSansBuginese-Regular.ttf", "NotoSansBuhid-Regular.ttf", + "NotoSansCJK-Regular.ttc", "NotoSansCanadianAboriginal-Regular.ttf", "NotoSansCarian-Regular.ttf", "NotoSansChakma-Regular.otf", "NotoSansCham-Bold.ttf", "NotoSansCham-Regular.ttf", "NotoSansCherokee-Regular.ttf", - "NotoSansCJK-Regular.ttc", "NotoSansCoptic-Regular.ttf", "NotoSansCuneiform-Regular.ttf", "NotoSansCypriot-Regular.ttf", @@ -582,10 +165,10 @@ android_system_image { "NotoSansMyanmarUI-Bold.otf", "NotoSansMyanmarUI-Medium.otf", "NotoSansMyanmarUI-Regular.otf", + "NotoSansNKo-Regular.ttf", "NotoSansNabataean-Regular.otf", - "NotoSansNewa-Regular.otf", "NotoSansNewTaiLue-Regular.ttf", - "NotoSansNKo-Regular.ttf", + "NotoSansNewa-Regular.otf", "NotoSansOgham-Regular.ttf", "NotoSansOlChiki-Regular.ttf", "NotoSansOldItalic-Regular.ttf", @@ -675,340 +258,392 @@ android_system_image { "NotoSerifThai-Regular.ttf", "NotoSerifTibetan-VF.ttf", "NotoSerifYezidi-VF.ttf", - "odsign", - "ot-cli-ftd", - "ot-ctl", - "otapreopt_chroot", - "otapreopt_script", - "otapreopt_slot", - "otapreopt", - "passwd_odm", - "passwd_product", - "passwd_system_ext", - "passwd_system", - "passwd_vendor", - "perfetto", - "ping", - "ping6", - "pintool", - "platform.xml", - "pm", - "power.default", - "preinstalled-packages-asl-files.xml", - "preinstalled-packages-platform-aosp-product.xml", - "preinstalled-packages-platform-generic-system.xml", - "preinstalled-packages-platform-handheld-product.xml", - "preinstalled-packages-platform-handheld-system.xml", - "preinstalled-packages-platform-telephony-product.xml", - "preinstalled-packages-platform.xml", - "preinstalled-packages-strict-signature.xml", - "preloads_copy.sh", - "preloads_copy.sh", - "preopt2cachename", - "preopt2cachename", - "printflags", - "privapp-permissions-platform.xml", - "prng_seeder", - "procrank", - "profcollectctl", - "profcollectd", - "reboot", - "record_binder", - "recovery-persist", - "recovery-refresh", - "recovery", - "remount", - "requestsync", - "resize2fs", "Roboto-Regular.ttf", "RobotoFlex-Regular.ttf", "RobotoStatic-Regular.ttf", - "rss_hwm_reset", - "run-as", - "sample_camera_extensions.xml", - "sanitizer-status", - "schedtest", - "screencap", - "screenrecord", - "sdcard", - "secdiscard", - "sensorservice", - "server_configurable_flags", - "service", - "servicedispatcher", - "servicemanager.recovery", - "servicemanager", - "settaskprofile", - "settings", - "sfdo", - "sgdisk", - "sh", - "showmap", - "simpleperf_app_runner", - "simpleperf", - "sload_f2fs", - "sm", - "snapshotctl", - "snapuserd_ramdisk", - "snapuserd", - "socket_vsock_proxy", "SourceSansPro-Bold.ttf", "SourceSansPro-BoldItalic.ttf", "SourceSansPro-Italic.ttf", "SourceSansPro-Regular.ttf", "SourceSansPro-SemiBold.ttf", "SourceSansPro-SemiBoldItalic.ttf", - "sqlite3", - "ss", - "start_with_lockagent", - "storaged", - "strace", - "surfaceflinger", - "suspend_blocker", - "svc", - "task_profiles.json", - "tc", - "tcpdump", - "telecom", - "tinycap", - "tinyhostless", - "tinymix", - "tinypcminfo", - "tinyplay", - "tombstone_producer", - "tombstone_transmit", - "tombstoned", - "toolbox", - "toybox", - "toybox", - "traced_perf", - "traced_probes", - "traced", - "tracepath", - "tracepath6", - "traceroute6", - "trigger_perfetto", - "tune2fs", - "ueventd.rc", - "uiautomator", - "uinput", - "uncrypt", - "unwind_info", - "unwind_reg_info", - "unwind_symbols", - "update_engine_client", - "update_engine_sideload", - "update_engine", - "update_verifier", - "usbd", - "vdc", - "vibrator.default", - "virtual_camera", - "vold_prepare_subdirs", - "vold", - "vr", - "watchdogd", - "wifi.rc", - "wificond", - "wm", - "xml2abx", - "xtables.lock", - "ziptool", + "font_fallback.xml", + "fonts.xml", ], +} + +android_system_image { + name: "aosp_cf_system_x86_64", + + partition_name: "system", + base_dir: "system", + dirs: android_rootdirs, + symlinks: android_symlinks, + file_contexts: ":plat_file_contexts", + linker_config_src: "linker.config.json", + fsverity: { + inputs: [ + "etc/boot-image.prof", + "etc/dirty-image-objects", + "etc/preloaded-classes", + "etc/classpaths/*.pb", + "framework/*", + "framework/*/*", // framework/{arch} + "framework/oat/*/*", // framework/oat/{arch} + ], + libs: [":framework-res{.export-package.apk}"], + }, + build_logtags: true, + gen_aconfig_flags_pb: true, + + compile_multilib: "both", + + use_avb: true, + avb_private_key: ":microdroid_sign_key", + avb_algorithm: "SHA256_RSA4096", + avb_hash_algorithm: "sha256", + + deps: [ + "android.hardware.biometrics.fingerprint@2.1", // generic_system + "android.hardware.radio@1.0", // generic_system + "android.hardware.radio@1.1", // generic_system + "android.hardware.radio@1.2", // generic_system + "android.hardware.radio@1.3", // generic_system + "android.hardware.radio@1.4", // generic_system + "android.hardware.radio.config@1.0", // generic_system + "android.hardware.radio.deprecated@1.0", // generic_system + "android.hardware.secure_element@1.0", // generic_system + "abx", + "aconfigd", + "aflags", + "am", + "android_build_prop", + "android_vintf_manifest", + "android.system.suspend-service", + "apexd", + "app_process", + "appops", + "appwidget", + "atrace", + "audioserver", + "bcc", + "blank_screen", + "blkid", + "bmgr", + "bootanimation", + "bootstat", + "boringssl_self_test", + "bpfloader", + "bu", + "bugreport", + "bugreportz", + "cameraserver", + "cgroups.json", + "cmd", + "content", + "cppreopts.sh", // generic_system + "credstore", + "debuggerd", + "device_config", + "dirty-image-objects", + "dmctl", + "dmesgd", + "dnsmasq", + "dpm", + "dump.erofs", + "dumpstate", + "dumpsys", + "e2fsck", + "etc_hosts", + "flags_health_check", + "framework-audio_effects.xml", // for handheld // handheld_system + "framework-sysconfig.xml", + "fsck_msdos", + "fsck.erofs", + "fsck.f2fs", // for media_system + "fsverity-release-cert-der", + "fs_config_files_system", + "fs_config_dirs_system", + "gatekeeperd", + "gpu_counter_producer", + "gpuservice", + "group_system", + "gsi_tool", + "gsid", + "heapprofd_client", + "heapprofd", + "hid", + "hiddenapi-package-whitelist.xml", // from runtime_libart + "idc_data", + "idmap2", + "idmap2d", + "ime", + "incident_helper", + "incident-helper-cmd", + "incident", + "incidentd", + "init_first_stage", // for boot partition + // "init.environ.rc", // TODO: move to soong + "init.usb.configfs.rc", + "init.usb.rc", + "init.zygote32.rc", + "init.zygote64_32.rc", + "init.zygote64.rc", + "initial-package-stopped-states.xml", + "input", + "installd", + "ip", // base_system + "iptables", + "kcmdlinectrl", + "keychars_data", + "keylayout_data", + "keystore2", + "ld.mc", + "libaaudio", + "libalarm_jni", + "libamidi", + "linker", // ok + "llkd", // base_system + "lmkd", // base_system + "local_time.default", // handheld_vendo + "locksettings", // base_system + "logcat", // base_system + "logd", // base_system + "lpdump", // base_system + "lshal", // base_system + "make_f2fs", // media_system + "mdnsd", // base_system + "media_profiles_V1_0.dtd", // base_system + "mediacodec.policy", // base_system + "mediaextractor", // base_system + "mediametrics", // base_system + "misctrl", // from base_system + "mke2fs", // base_system + "mkfs.erofs", // base_system + "monkey", // base_system + "mtectrl", // base_system + "ndc", // base_system + "netd", // base_system + "netutils-wrapper-1.0", // full_base + "odsign", // base_system + "otapreopt_script", // generic_system + "passwd_system", // base_system + "perfetto", // base_system + "ping", // base_system + "ping6", // base_system + "pintool", // base_system + "platform.xml", // base_system + "pm", // base_system + "preinstalled-packages-asl-files.xml", // base_system + "preinstalled-packages-platform-generic-system.xml", // generic_system + "preinstalled-packages-platform-handheld-system.xml", // handheld_system + "preinstalled-packages-platform.xml", // base_system + "preinstalled-packages-strict-signature.xml", // base_system + "preloaded-classes", // ok + "printflags", // base_system + "privapp-permissions-platform.xml", // base_system + "prng_seeder", // base_system + "public.libraries.android.txt", + "recovery-persist", // base_system + "recovery-refresh", // generic_system + "requestsync", // media_system + "resize2fs", // base_system + "rss_hwm_reset", // base_system + "run-as", // base_system + "schedtest", // base_system + "screencap", // base_system + "screenrecord", // handheld_system + "sdcard", // base_system + "secdiscard", // base_system + "sensorservice", // base_system + "service", // base_system + "servicemanager", // base_system + "settings", // base_system + "sfdo", // base_system + "sgdisk", // base_system + "sm", // base_system + "snapshotctl", // base_system + "snapuserd_ramdisk", // ramdisk + "snapuserd", // base_system + "storaged", // base_system + "surfaceflinger", // base_system + "svc", // base_system + "task_profiles.json", // base_system + "tc", // base_system + "telecom", // base_system + "tombstoned", // base_system + "traced_probes", // base_system + "traced", // base_system + "tune2fs", // base_system + "uiautomator", // base_system + "uinput", // base_system + "uncrypt", // base_system + "update_engine_sideload", // recovery + "update_engine", // generic_system + "update_verifier", // generic_system + "usbd", // base_system + "vdc", // base_system + "virtual_camera", // handheld_system // release_package_virtual_camera + "vold", // base_system + "vr", // handheld_system + "watchdogd", // base_system + "wifi.rc", // base_system + "wificond", // base_system + "wm", // base_system + ] + select(product_variable("debuggable"), { + true: [ + "adevice_fingerprint", + "arping", + "avbctl", + "bootctl", + "dmuserd", + "evemu-record", + "idlcli", + "init-debug.rc", + "iotop", + "iperf3", + "iw", + "layertracegenerator", + "logpersist.start", + "logtagd.rc", + "ot-cli-ftd", + "ot-ctl", + "procrank", + "profcollectctl", + "profcollectd", + "record_binder", + "sanitizer-status", + "servicedispatcher", + "showmap", + "sqlite3", + "ss", + "start_with_lockagent", + "strace", + "su", + "tinycap", + "tinyhostless", + "tinymix", + "tinypcminfo", + "tinyplay", // host + "tracepath", + "tracepath6", + "traceroute6", + "unwind_info", + "unwind_reg_info", + "unwind_symbols", + "update_engine_client", + ], + + default: [], + }), multilib: { common: { deps: [ - "AccessibilityMenu", - "adbd_system_api", - "android.hardware.drm@latest-service.clearkey", - "android.hidl.base-V1.0-java", - "android.hidl.manager-V1.0-java", - "android.test.base", - "android.test.mock", - "android.test.runner", - "androidx.camera.extensions.impl", - "androidx.window.extensions", - "androidx.window.sidecar", - "aosp_mainline_modules", - "BackupRestoreConfirmation", - "BasicDreams", - "BlockedNumberProvider", - "BluetoothMidiService", - "BookmarkProvider", - "bpfMemEvents.o", - "bpfMemEventsTest.o", - "bpfRingbufProg.o", - "Browser2", - "BuiltInPrintService", - "Calendar", - "CalendarProvider", - "CallLogBackup", - "Camera2", - "CameraExtensionsProxy", - "CaptivePortalLogin", - "CarrierConfig", - "CarrierDefaultApp", - "CellBroadcastLegacyApp", - "CertInstaller", - "CFSatelliteService", - "charger_res_images", - "com.android.apex.cts.shim.v1_prebuilt", - "com.android.cellbroadcast", - "com.android.compos", - "com.android.future.usb.accessory", - "com.android.hardware.authsecret", - "com.android.hardware.biometrics.face.virtual", - "com.android.hardware.biometrics.fingerprint.virtual", - "com.android.hardware.boot", - "com.android.hardware.cas", - "com.android.hardware.contexthub", - "com.android.hardware.dumpstate", - "com.android.hardware.gnss", - "com.android.hardware.input.processor", - "com.android.hardware.keymint.rust_cf_remote", - "com.android.hardware.keymint.rust_nonsecure", - "com.android.hardware.memtrack", - "com.android.hardware.net.nlinterceptor", - "com.android.hardware.neuralnetworks", - "com.android.hardware.power", - "com.android.hardware.rebootescrow", - "com.android.hardware.secure_element", - "com.android.hardware.security.authgraph", - "com.android.hardware.sensors", - "com.android.hardware.tetheroffload", - "com.android.hardware.thermal", - "com.android.hardware.threadnetwork", - "com.android.hardware.usb", - "com.android.hardware.uwb", - "com.android.hardware.vibrator", - "com.android.hardware.wifi", - "com.android.i18n", - "com.android.ipsec", - "com.android.hardware.gatekeeper.cf_remote", - "com.android.hardware.gatekeeper.nonsecure", - "com.android.hardware.keymint.rust_cf_remote", - "com.android.hardware.keymint.rust_nonsecure", - "com.android.location.provider", - "com.android.media.remotedisplay.xml", - "com.android.media.remotedisplay", - "com.android.mediadrm.signer", - "com.android.nfc_extras", - "com.android.runtime", - "com.google.cf.bt", - "com.google.cf.confirmationui", - "com.google.cf.health.storage", - "com.google.cf.health", - "com.google.cf.identity", - "com.google.cf.input.config", - "com.google.cf.ir", - "com.google.cf.light", - "com.google.cf.nfc", - "com.google.cf.oemlock", - "com.google.cf.rild", - "com.google.cf.vulkan", - "com.google.cf.wifi", - "CompanionDeviceManager", - "Contacts", - "ContactsProvider", - "CredentialManager", - "CuttlefishService", - "CuttlefishTetheringOverlay", - "CuttlefishWifiOverlay", - "DeskClock", - "DeviceAsWebcam", - "DocumentsUI", - "DownloadProvider", - "DownloadProviderUi", - "DynamicSystemInstallationService", - "EasterEgg", - "EmergencyInfo", - "ext", - "ExternalStorageProvider", - "ExtShared", - "framework-graphics", - "framework-location", - "framework-minus-apex-install-dependencies", - "framework-nfc", - "framework-res", - "FusedLocation", - "fuseMedia.o", - "Gallery2", - "gpuMem.o", - "gpuWork.o", - "HTMLViewer", - "hwservicemanager_compat_symlink_module", - "ims-common", - "ImsServiceEntitlement", - "init_system", - "InputDevices", - "IntentResolver", - "javax.obex", - "KeyChain", - "LatinIME", - "Launcher3QuickStep", - "LiveWallpapersPicker", - "llndk.libraries.txt", - "LocalTransport", - "lockagent", - "ManagedProvisioning", - "MediaProviderLegacy", - "messaging", - "MmsService", - "ModuleMetadata", - "MtpService", - "Music", - "MusicFX", - "NetworkStack", - "NfcNci", - "ONS", - "org.apache.http.legacy", - "PackageInstaller", - "PacProcessor", - "PartnerBookmarksProvider", - "PhotoTable", - "PrintRecommendationService", - "PrintSpooler", - "Provision", - "ProxyHandler", - "QualifiedNetworksService", - "QuickSearchBox", - "SecureElement", - "selinux_policy_system_soong", - "services", - "Settings", - "SettingsIntelligence", - "SettingsProvider", - "SharedStorageBackup", - "shell_and_utilities_recovery", - "shell_and_utilities_system", - "shell_and_utilities_vendor", - "Shell", - "SimAppDialog", - "SoundPicker", - "StatementService", - "Stk", - "StorageManager", - "SystemUI", - "Tag", - "Telecom", - "telephony-common", - "TelephonyProvider", - "TeleService", - "timeInState.o", - "Traceur", - "UserDictionaryProvider", - "voip-common", - "VpnDialogs", - "WallpaperBackup", - "WallpaperCropper", - "webview", + "adbd_system_api", // base_system + "android.hidl.base-V1.0-java", // base_system + "android.hidl.manager-V1.0-java", // base_system + "android.test.base", // from runtime_libart + "android.test.mock", // base_system + "android.test.runner", // base_system + "aosp_mainline_modules", // ok + "BackupRestoreConfirmation", // base_system + "BasicDreams", // handheld_system + "BlockedNumberProvider", // handheld_system + "BluetoothMidiService", // handheld_system + "BookmarkProvider", // handheld_system + "build_flag_system", // base_system + "BuiltInPrintService", // handheld_system + "CalendarProvider", // handheld_system + "CallLogBackup", // telephony_system + "CameraExtensionsProxy", // handheld_system + "CaptivePortalLogin", // handheld_system + "CarrierDefaultApp", // telephony_system + "CellBroadcastLegacyApp", // telephony_system + "CertInstaller", // handheld_system + "charger_res_images", // generic_system + "com.android.apex.cts.shim.v1_prebuilt", // ok + "com.android.cellbroadcast", // telephony_system + "com.android.future.usb.accessory", // media_system + "com.android.location.provider", // base_system + "com.android.media.remotedisplay.xml", // media_system + "com.android.media.remotedisplay", // media_system + "com.android.mediadrm.signer", // media_system + "com.android.nfc_extras", // ok + "com.android.runtime", // ok + "CompanionDeviceManager", // media_system + "ContactsProvider", // base_system + "CredentialManager", // handheld_system + "DeviceAsWebcam", // handheld_system + "DocumentsUI", // handheld_system + "DownloadProvider", // base_system + "DownloadProviderUi", // handheld_system + "DynamicSystemInstallationService", // base_system + "EasterEgg", // handheld_system + "ext", // from runtime_libart + "ExternalStorageProvider", // handheld_system + "ExtShared", // base_system + "fonts", // ok + "framework-graphics", // base_system + "framework-location", // base_system + "framework-minus-apex-install-dependencies", // base_system + "framework-nfc", // base_system + "FusedLocation", // handheld_system + "HTMLViewer", // media_system + "hwservicemanager_compat_symlink_module", // base_system + "hyph-data", + "ims-common", // base_system + "init_system", // base_system + "InputDevices", // handheld_system + "IntentResolver", // base_system + "javax.obex", // base_system + "KeyChain", // handheld_system + "LiveWallpapersPicker", // generic_system, full_base + "llndk.libraries.txt", //ok + "LocalTransport", // base_system + "ManagedProvisioning", // handheld_system + "MediaProviderLegacy", // base_system + "MmsService", // handheld_system + "MtpService", // handheld_system + "MusicFX", // handheld_system + "NetworkStack", // base_system + "NfcNci", // base_system + "ONS", // telephony_system + "org.apache.http.legacy", // base_system + "perfetto-extras", // system + "PackageInstaller", // base_system + "PacProcessor", // handheld_system + "PartnerBookmarksProvider", // generic_system + "PhotoTable", // full_base + "PrintRecommendationService", // handheld_system + "PrintSpooler", // handheld_system + "ProxyHandler", // handheld_system + "SecureElement", // handheld_system + "selinux_policy_system_soong", // ok + "services", // base_system + "SettingsProvider", // base_system + "SharedStorageBackup", // handheld_system + "shell_and_utilities_system", // ok + "Shell", // base_system + "SimAppDialog", // handheld_system + "SoundPicker", // not installed by anyone + "StatementService", // media_system + "Stk", // generic_system + "Tag", // generic_system + "Telecom", // handheld_system + "telephony-common", // libs from TeleService + "TelephonyProvider", // handheld_system + "TeleService", // handheld_system + "Traceur", // handheld_system + "UserDictionaryProvider", // handheld_system + "voip-common", // base_system + "VpnDialogs", // handheld_system + "WallpaperBackup", // base_system ], }, - lib32: { + prefer32: { deps: [ - "android.hardware.audio.service", - "drmserver", - "mediaserver", + "drmserver", // media_system + "mediaserver", // base_system ], }, lib64: { @@ -1018,47 +653,105 @@ android_system_image { "servicemanager", ], }, - }, - base_dir: "system", - dirs: android_rootdirs, - symlinks: android_symlinks, - file_contexts: ":plat_file_contexts", - linker_config_src: "linker.config.json", - arch: { - x86: { - multilib: { - common: { - deps: [ - "com.android.wifi", - ], - }, - }, - }, - x86_64: { + both: { deps: [ - "libgfxstream_backend", - ], - multilib: { - common: { - deps: [ - "com.android.wifi", - ], - }, - }, + "libandroid_runtime", + "libandroid_servers", + "libandroid", + "libandroidfw", + "libartpalette-system", + "libaudio-resampler", // generic-system + "libaudioeffect_jni", + "libaudiohal", // generic-system + "libaudiopolicyengineconfigurable", // generic-system + "libbinder_ndk", + "libbinder_rpc_unstable", + "libbinder", + "libcamera2ndk", + "libclang_rt.asan", + "libcompiler_rt", + "libcutils", // used by many libs + "libdmabufheap", // used by many libs + "libdrm", // used by many libs // generic_system + "libdrmframework_jni", // base_system + "libdrmframework", // base_system + "libEGL_angle", // base_system + "libEGL", // base_system + "libETC1", // base_system + "libfdtrack", // base_system + "libFFTEm", // base_system + "libfilterfw", // base_system + "libfilterpack_imageproc", // media_system + "libfwdlockengine", // generic_system + "libgatekeeper", // base_system + "libGLESv1_CM_angle", // base_system + "libGLESv1_CM", // base_system + "libGLESv2_angle", // base_system + "libGLESv2", // base_system + "libGLESv3", // base_system + "libgui", // base_system + "libhardware_legacy", // base_system + "libhardware", // base_system + "libhidltransport", // generic_system + "libhwbinder", // generic_system + "libinput", // base_system + "libinputflinger", // base_system + "libiprouteutil", // base_system + "libjnigraphics", // base_system + "libjpeg", // base_system + "liblog", // base_system + "liblogwrap", // generic_system + "liblz4", // generic_system + "libmedia_jni", // base_system + "libmedia", // base_system + "libmediandk", // base_system + "libminui", // generic_system + "libmtp", // base_system + "libnetd_client", // base_system + "libnetlink", // base_system + "libnetutils", // base_system + "libneuralnetworks_packageinfo", // base_system + "libnl", // generic_system + "libOpenMAXAL", // base_system + "libOpenSLES", // base_system + "libpdfium", // base_system + "libpolicy-subsystem", // generic_system + "libpower", // base_system + "libpowermanager", // base_system + "libprotobuf-cpp-full", // generic_system + "libradio_metadata", // base_system + "librs_jni", // handheld_system + "librtp_jni", // base_system + "libsensorservice", // base_system + "libsfplugin_ccodec", // base_system + "libskia", // base_system + "libsonic", // base_system + "libsonivox", // base_system + "libsoundpool", // base_system + "libspeexresampler", // base_system + "libsqlite", // base_system + "libstagefright_foundation", // base_system + "libstagefright_omx", // base_system + "libstagefright", // base_system + "libstdc++", // base_system + "libsysutils", // base_system + "libui", // base_system + "libusbhost", // base_system + "libutils", // base_system + "libvintf_jni", // base_system + "libvulkan", // base_system + "libwebviewchromium_loader", // media_system + "libwebviewchromium_plat_support", // media_system + "libwilhelm", // base_system + ] + select(soong_config_variable("ANDROID", "TARGET_DYNAMIC_64_32_DRMSERVER"), { + "true": ["drmserver"], + default: [], + }) + select(soong_config_variable("ANDROID", "TARGET_DYNAMIC_64_32_MEDIASERVER"), { + "true": ["mediaserver"], + default: [], + }), }, }, - fsverity: { - inputs: [ - "etc/boot-image.prof", - "etc/dirty-image-objects", - "etc/preloaded-classes", - "etc/classpaths/*.pb", - "framework/*", - "framework/*/*", // framework/{arch} - "framework/oat/*/*", // framework/oat/{arch} - ], - libs: [":framework-res{.export-package.apk}"], - }, } prebuilt_etc { |