diff options
| -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), |