summaryrefslogtreecommitdiff
path: root/fsgen/filesystem_creator.go
diff options
context:
space:
mode:
author Spandan Das <spandandas@google.com> 2025-02-12 15:27:24 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-02-12 15:27:24 -0800
commit3a43e39fa226d2631960a14d330b4774c4c6fdf0 (patch)
treef54e8dafe3689ec547c4eca5013f73e1410bd0c9 /fsgen/filesystem_creator.go
parentb5525e044f5df1e6da0ce8b56186d8c17cc40124 (diff)
parent35b7874f19b6fd5610a16997ad5e0afa871eaf24 (diff)
Merge changes from topics "soong_ab_partitions.txt", "soong_otakeys.txt" into main
* changes: Add ab_ota_keys prop to android_device Add ab_ota_partitions prop to android_device
Diffstat (limited to 'fsgen/filesystem_creator.go')
-rw-r--r--fsgen/filesystem_creator.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index 2c2da1772..9217e1c33 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -381,8 +381,9 @@ func (f *filesystemCreator) createDeviceModule(
partitionProps.Vbmeta_partitions = vbmetaPartitions
deviceProps := &filesystem.DeviceProperties{
- Main_device: proptools.BoolPtr(true),
- Ab_ota_updater: proptools.BoolPtr(ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.AbOtaUpdater),
+ Main_device: proptools.BoolPtr(true),
+ Ab_ota_updater: proptools.BoolPtr(ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.AbOtaUpdater),
+ Ab_ota_partitions: ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.AbOtaPartitions,
}
if bootloader, ok := f.createBootloaderFilegroup(ctx); ok {
deviceProps.Bootloader = proptools.StringPtr(":" + bootloader)