diff options
| author | 2024-12-06 06:06:05 +0000 | |
|---|---|---|
| committer | 2024-12-06 06:06:05 +0000 | |
| commit | 3930dceec456e009d2a5fd02e6120884e67bc76f (patch) | |
| tree | 0d8383b2cceb141e7c6b5dbed691bc12eb695708 | |
| parent | 95070344a69a4e52bc8c9afff543ef6786579dc9 (diff) | |
| parent | f3c8ddf76200b3e1b481e27d13d0f67d037df89f (diff) | |
Change SuperImageProperties.Block_devices to be a slice of string am: f3c8ddf762
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3393126
Change-Id: I3cf25a7978221901a0bbd92d34b571d26d6df0f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | filesystem/super_image.go | 6 | ||||
| -rw-r--r-- | fsgen/super_img.go | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/filesystem/super_image.go b/filesystem/super_image.go index 1583c0b4f..0f8f614b4 100644 --- a/filesystem/super_image.go +++ b/filesystem/super_image.go @@ -44,7 +44,7 @@ type SuperImageProperties struct { // the block device where metadata for dynamic partitions is stored Metadata_device *string // the super partition block device list - Block_devices *string + Block_devices []string // whether A/B updater is used Ab_update *bool // whether dynamic partitions is enabled on devices that were launched without this support @@ -153,7 +153,9 @@ func (s *superImage) buildMiscInfo(ctx android.ModuleContext) (android.Path, and addStr("dynamic_partition_retrofit", strconv.FormatBool(proptools.Bool(s.properties.Retrofit))) addStr("lpmake", "lpmake") addStr("super_metadata_device", proptools.String(s.properties.Metadata_device)) - addStr("super_block_devices", proptools.String(s.properties.Block_devices)) + if len(s.properties.Block_devices) > 0 { + addStr("super_block_devices", strings.Join(s.properties.Block_devices, " ")) + } addStr("super_super_device_size", strconv.Itoa(proptools.Int(s.properties.Size))) var groups, partitionList []string for _, groupInfo := range s.properties.Partition_groups { diff --git a/fsgen/super_img.go b/fsgen/super_img.go index 45698969f..8ee3bf2ee 100644 --- a/fsgen/super_img.go +++ b/fsgen/super_img.go @@ -35,7 +35,7 @@ func createSuperImage(ctx android.LoadHookContext, partitions []string, partitio superImageProps := &filesystem.SuperImageProperties{ Metadata_device: proptools.StringPtr(partitionVars.BoardSuperPartitionMetadataDevice), - Block_devices: proptools.StringPtr(partitionVars.BoardSuperPartitionBlockDevices[0]), + Block_devices: partitionVars.BoardSuperPartitionBlockDevices, Ab_update: proptools.BoolPtr(partitionVars.AbOtaUpdater), Retrofit: proptools.BoolPtr(partitionVars.ProductRetrofitDynamicPartitions), Virtual_ab: proptools.BoolPtr(partitionVars.ProductVirtualAbOta), |