From 1bf169a34ce865e686feae2a239ac6c099b56f00 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Fri, 21 Mar 2025 16:56:06 +0000 Subject: Add `avb_custom_vbmeta_images_partition_list` to misc_info.txt Make generates this from `BOARD_AVB_VBMETA_CUSTOM_PARTITIONS`. To generate this in Soong, a new Filesytem_partition_type is added to vbmeta modules. For the chained vbmeta partitions for cuttlefish, this will be - system - vendor - system_dlkm - vendor_dlkm android_device will query this information from its vbmeta partitions, and filter out system and vendor. Bug: 398036609 Test: Built and diff'd misc_info.txt locally Change-Id: I8ff3fe5e5e50504e49abbf89f7d50be472e64e30 --- filesystem/vbmeta.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'filesystem/vbmeta.go') diff --git a/filesystem/vbmeta.go b/filesystem/vbmeta.go index d59a2aec5..e7a39bef7 100644 --- a/filesystem/vbmeta.go +++ b/filesystem/vbmeta.go @@ -55,6 +55,10 @@ type VbmetaProperties struct { // Name of the partition stored in vbmeta desc. Defaults to the name of this module. Partition_name *string + // Type of the `android_filesystem` for which the vbmeta.img is created. + // Examples are system, vendor, product. + Filesystem_partition_type *string + // Set the name of the output. Defaults to .img. Stem *string @@ -118,6 +122,9 @@ type vbmetaPartitionInfo struct { // Name of the partition Name string + // Partition type of the correspdonding android_filesystem. + FilesystemPartitionType string + // Rollback index location, non-negative int RollbackIndexLocation int @@ -305,11 +312,12 @@ func (v *vbmeta) GenerateAndroidBuildActions(ctx android.ModuleContext) { }) android.SetProvider(ctx, vbmetaPartitionProvider, vbmetaPartitionInfo{ - Name: v.partitionName(), - RollbackIndexLocation: ril, - PublicKey: extractedPublicKey, - Output: output, - PropFileForMiscInfo: v.buildPropFileForMiscInfo(ctx), + Name: v.partitionName(), + FilesystemPartitionType: proptools.String(v.properties.Filesystem_partition_type), + RollbackIndexLocation: ril, + PublicKey: extractedPublicKey, + Output: output, + PropFileForMiscInfo: v.buildPropFileForMiscInfo(ctx), }) ctx.SetOutputFiles([]android.Path{output}, "") -- cgit v1.2.3-59-g8ed1b