diff options
| author | 2025-01-16 19:44:34 +0000 | |
|---|---|---|
| committer | 2025-01-16 19:44:34 +0000 | |
| commit | f2aecfa472735684df34389fd608844a1b4ee37b (patch) | |
| tree | 519c98dbaad5ffba8b04394999bbeba73b03f260 | |
| parent | a14309ca3e25a2bbd1d175dae1e0c98d8bb37b6c (diff) | |
Skip adding recovery partition in vbmeta chained_partitions
To follow the behavior in make. Make generated vbmeta partition always
skips recovery partition in generating `--chain_partition` arguments.
Test: compare the command lines of make vs soong vbmeta.img
Bug: 390204058
Change-Id: Ia8738011a727c7255783648ab52b22c4d7e19e69
| -rw-r--r-- | fsgen/vbmeta_partitions.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fsgen/vbmeta_partitions.go b/fsgen/vbmeta_partitions.go index a75f59ce8..e3dc41679 100644 --- a/fsgen/vbmeta_partitions.go +++ b/fsgen/vbmeta_partitions.go @@ -154,8 +154,9 @@ func createVbmetaPartitions(ctx android.LoadHookContext, generatedPartitionTypes // Already handled by a chained vbmeta partition continue } - if strings.Contains(partitionType, "ramdisk") || strings.Contains(partitionType, "boot") || partitionType == "userdata" { + if strings.Contains(partitionType, "ramdisk") || strings.Contains(partitionType, "boot") || partitionType == "userdata" || partitionType == "recovery" { // ramdisk and userdata are never signed with avb information + // recovery partition is skipped in adding the partition descriptor into vbmeta.img. // boot partitions just have the avb footer, and don't have a corresponding vbmeta // partition. continue |