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

Add fsverity/compos only for 64-bit images

Browse source 
Because AVF is shipped only on 64-bit devices.

Bug: 381019944
Test: TH
Change-Id: Icbf4656f9b830e6254024558e96fc3c5dae6113c
This commit is contained in:
Inseob Kim 2025-01-09 18:40:24 +09:00 • committed by Luca Stefani
parent 11d4e154ed
commit 6a04b1f9a2
3 changed files with 39 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/android_soong_config_vars.mk
View file

@ -40,6 +40,7 @@ $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_DRMSERVER)
$(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64)
$(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_MEDIASERVER)
$(call add_soong_config_var,ANDROID,BOARD_GENFS_LABELS_VERSION)
$(call soong_config_set_bool,ANDROID,PRODUCT_FSVERITY_GENERATE_METADATA,$(if $(filter true,$(PRODUCT_FSVERITY_GENERATE_METADATA)),true,false))
$(call add_soong_config_var,ANDROID,ADDITIONAL_M4DEFS,$(if $(BOARD_SEPOLICY_M4DEFS),$(addprefix -D,$(BOARD_SEPOLICY_M4DEFS))))

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

@ -417,6 +417,19 @@ android_filesystem_defaults {
}),
}
system_image_fsverity_default = {
inputs: [
"etc/boot-image.prof",
"etc/classpaths/*.pb",
"etc/dirty-image-objects",
"etc/preloaded-classes",
"framework/*",
"framework/*/*", // framework/{arch}
"framework/oat/*/*", // framework/oat/{arch}
],
libs: [":framework-res{.export-package.apk}"],
}
android_filesystem_defaults {
name: "system_image_defaults",
partition_name: "system",
@ -429,16 +442,22 @@ android_filesystem_defaults {
linker_config_srcs: [":system_linker_config_json_file"],
},
fsverity: {
inputs: [
"etc/boot-image.prof",
"etc/classpaths/*.pb",
"etc/dirty-image-objects",
"etc/preloaded-classes",
"framework/*",
"framework/*/*", // framework/{arch}
"framework/oat/*/*", // framework/oat/{arch}
],
libs: [":framework-res{.export-package.apk}"],
inputs: select(soong_config_variable("ANDROID", "PRODUCT_FSVERITY_GENERATE_METADATA"), {
true: [
"etc/boot-image.prof",
"etc/classpaths/*.pb",
"etc/dirty-image-objects",
"etc/preloaded-classes",
"framework/*",
"framework/*/*", // framework/{arch}
"framework/oat/*/*", // framework/oat/{arch}
],
default: [],
}),
libs: select(soong_config_variable("ANDROID", "PRODUCT_FSVERITY_GENERATE_METADATA"), {
true: [":framework-res{.export-package.apk}"],
default: [],
}),
},
build_logtags: true,
gen_aconfig_flags_pb: true,

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

@ -129,12 +129,6 @@ android_system_image {
"com.android.vndk.v33",
"com.android.vndk.v34",
///////////////////////////////////////////
// AVF
///////////////////////////////////////////
"com.android.compos",
"features_com.android.virt.xml",
///////////////////////////////////////////
// gsi_product
///////////////////////////////////////////
@ -145,6 +139,15 @@ android_system_image {
"apns-full-conf.xml",
],
multilib: {
lib64: {
deps: [
///////////////////////////////////////////
// AVF
///////////////////////////////////////////
"com.android.compos",
"features_com.android.virt.xml",
],
},
both: {
// PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34
deps: ["android.hidl.memory@1.0-impl"],