ScoopDroid/android_build
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add default modules for system_ext and product

Browse source 
Also fixes gsi_x86_64_soong_system.

Bug: 381019466
Test: build gsi_x86_64_soong_system
Change-Id: Ib048f4b45ffa77a8ba41341426d6b42cea1549bd
This commit is contained in:
Inseob Kim 2024-12-23 15:16:00 +09:00 • committed by Luca Stefani
parent 9db2fb62fe
commit 11d4e154ed
2 changed files with 77 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
target/product/generic/Android.bp
View file

@ -346,6 +346,77 @@ phony {
],
}
android_filesystem_defaults {
name: "system_ext_image_defaults",
deps: [
///////////////////////////////////////////
// base_system_ext
///////////////////////////////////////////
"build_flag_system_ext",
"fs_config_dirs_system_ext",
"fs_config_files_system_ext",
"group_system_ext",
"passwd_system_ext",
"SatelliteClient",
"selinux_policy_system_ext",
"system_ext_manifest.xml",
"system_ext-build.prop",
// Base modules when shipping api level is less than or equal to 34
"hwservicemanager",
"android.hidl.allocator@1.0-service",
///////////////////////////////////////////
// window_extensions_base
///////////////////////////////////////////
"androidx.window.extensions",
"androidx.window.sidecar",
///////////////////////////////////////////
// base_system
///////////////////////////////////////////
"charger",
] + select(release_flag("RELEASE_APPFUNCTION_SIDECAR"), {
true: [
"com.android.extensions.appfunctions",
"appfunctions.extension.xml",
],
default: [],
}),
}
android_filesystem_defaults {
name: "product_image_defaults",
deps: [
///////////////////////////////////////////
// media_product
///////////////////////////////////////////
"webview",
///////////////////////////////////////////
// base_product
///////////////////////////////////////////
// Base modules and settings for the product partition.
"build_flag_product",
"fs_config_dirs_product",
"fs_config_files_product",
"group_product",
"ModuleMetadata",
"passwd_product",
"product_compatibility_matrix.xml",
"product_manifest.xml",
"selinux_policy_product",
"product-build.prop",
// AUDIO
"frameworks_sounds",
] + select(product_variable("debuggable"), {
// Packages included only for eng or userdebug builds, previously debug tagged
true: ["adb_keys"],
default: [],
}),
}
android_filesystem_defaults {
name: "system_image_defaults",
partition_name: "system",

63
target/product/gsi/Android.bp
View file

@ -83,7 +83,11 @@ gsi_symlinks = [
android_system_image {
name: "android_gsi",
defaults: ["system_image_defaults"],
defaults: [
"system_image_defaults",
"system_ext_image_defaults",
"product_image_defaults",
],
symlinks: gsi_symlinks,
dirs: ["cache"],
deps: [
@ -106,28 +110,6 @@ android_system_image {
// This option is only meant to be set by compliance GSI targets.
"system_ext_userdebug_plat_sepolicy.cil",
///////////////////////////////////////////
// base_system_ext
///////////////////////////////////////////
"build_flag_system_ext",
"fs_config_dirs_system_ext",
"fs_config_files_system_ext",
"group_system_ext",
"passwd_system_ext",
"SatelliteClient",
"selinux_policy_system_ext",
"system_ext_manifest.xml",
"system_ext-build.prop",
// Base modules when shipping api level is less than or equal to 34
"hwservicemanager",
"android.hidl.allocator@1.0-service",
///////////////////////////////////////////
// window_extensions_base
///////////////////////////////////////////
"androidx.window.extensions",
"androidx.window.sidecar",
///////////////////////////////////////////
// gsi_release
///////////////////////////////////////////
@ -161,40 +143,7 @@ android_system_image {
"Dialer",
"LatinIME",
"apns-full-conf.xml",
///////////////////////////////////////////
// media_product
///////////////////////////////////////////
"webview",
///////////////////////////////////////////
// base_product
///////////////////////////////////////////
// Base modules and settings for the product partition.
"build_flag_product",
"fs_config_dirs_product",
"fs_config_files_product",
"group_product",
"ModuleMetadata",
"passwd_product",
"product_compatibility_matrix.xml",
"product_manifest.xml",
"selinux_policy_product",
"product-build.prop",
// AUDIO
"frameworks_sounds",
///////////////////////////////////////////
// base_system
///////////////////////////////////////////
"charger",
] + select(product_variable("debuggable"), {
// Packages included only for eng or userdebug builds, previously debug tagged
true: ["adb_keys"],
default: [],
}),
],
multilib: {
both: {
// PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34