diff options
author | 2025-03-20 05:04:21 -0700 | |
---|---|---|
committer | 2025-03-20 05:04:21 -0700 | |
commit | a68dfd0bbc975d903f4d29e361c5bb01d936a1ad (patch) | |
tree | 33cd4fc8d67fc7e3484e518930fa576cc8c7760d /filesystem/android_device.go | |
parent | 49700ed6bb32f43d8f20b47cdc8057ced23aafed (diff) | |
parent | 73cee7f629095cad7d853eb8ffcebd0eba875932 (diff) |
Merge "Add vbmeta partition info to misc_info.txt" into main am: 73cee7f629
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3550664
Change-Id: I523b7e33fb51db1179d9463505029aefcc4e95c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'filesystem/android_device.go')
-rw-r--r-- | filesystem/android_device.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/filesystem/android_device.go b/filesystem/android_device.go index 443e80e67..02bad0a3c 100644 --- a/filesystem/android_device.go +++ b/filesystem/android_device.go @@ -840,6 +840,15 @@ func (a *androidDevice) addMiscInfo(ctx android.ModuleContext) android.Path { Textf("echo avb_enable=true >> %s", miscInfo). Textf("&& echo avb_building_vbmeta_image=true >> %s", miscInfo). Textf("&& echo avb_avbtool=avbtool >> %s", miscInfo) + for _, vbmetaPartitionName := range a.partitionProps.Vbmeta_partitions { + img := ctx.GetDirectDepProxyWithTag(vbmetaPartitionName, filesystemDepTag) + if provider, ok := android.OtherModuleProvider(ctx, img, vbmetaPartitionProvider); ok { + builder.Command().Text("cat").Input(provider.PropFileForMiscInfo).Textf(" >> %s", miscInfo) + } else { + ctx.ModuleErrorf("vbmeta dep %s does not set vbmetaPartitionProvider\n", vbmetaPartitionName) + } + } + } if a.partitionProps.Boot_partition_name != nil { builder.Command().Textf("echo boot_images=boot.img >> %s", miscInfo) |