From 4daca6b242c87558de9841b2e915dffb0aae7011 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Fri, 26 Jul 2024 11:17:52 +0900 Subject: [PATCH] Make vbmeta Partitions property configurable This allows using select statements. Bug: 354824866 Test: boot Change-Id: I6cb41177620f85697eeaa77d3aec79f21674e245 --- filesystem/vbmeta.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filesystem/vbmeta.go b/filesystem/vbmeta.go index 0c6e7f428..f049ec49d 100644 --- a/filesystem/vbmeta.go +++ b/filesystem/vbmeta.go @@ -59,7 +59,7 @@ type vbmetaProperties struct { // List of filesystem modules that this vbmeta has descriptors for. The filesystem modules // have to be signed (use_avb: true). - Partitions []string + Partitions proptools.Configurable[[]string] // List of chained partitions that this vbmeta deletages the verification. Chained_partitions []chainedPartitionProperties @@ -110,7 +110,7 @@ type vbmetaDep struct { var vbmetaPartitionDep = vbmetaDep{kind: "partition"} func (v *vbmeta) DepsMutator(ctx android.BottomUpMutatorContext) { - ctx.AddDependency(ctx.Module(), vbmetaPartitionDep, v.properties.Partitions...) + ctx.AddDependency(ctx.Module(), vbmetaPartitionDep, v.properties.Partitions.GetOrDefault(v.ConfigurableEvaluator(ctx), nil)...) } func (v *vbmeta) installFileName() string {