Merge "Specify additional generated partitions for android_device module" into main
diff --git a/filesystem/android_device.go b/filesystem/android_device.go
index ea46556..19e93ae 100644
--- a/filesystem/android_device.go
+++ b/filesystem/android_device.go
@@ -22,21 +22,27 @@
)
type PartitionNameProperties struct {
- // Name of the Boot_partition_name partition filesystem module
+ // Name of the boot partition filesystem module
Boot_partition_name *string
- // Name of the System partition filesystem module
+ // Name of the vendor boot partition filesystem module
+ Vendor_boot_partition_name *string
+ // Name of the init boot partition filesystem module
+ Init_boot_partition_name *string
+ // Name of the system partition filesystem module
System_partition_name *string
- // Name of the System_ext partition filesystem module
+ // Name of the system_ext partition filesystem module
System_ext_partition_name *string
- // Name of the Product partition filesystem module
+ // Name of the product partition filesystem module
Product_partition_name *string
- // Name of the Vendor partition filesystem module
+ // Name of the vendor partition filesystem module
Vendor_partition_name *string
- // Name of the Odm partition filesystem module
+ // Name of the odm partition filesystem module
Odm_partition_name *string
+ // Name of the recovery partition filesystem module
+ Recovery_partition_name *string
// The vbmeta partition and its "chained" partitions
Vbmeta_partitions []string
- // Name of the Userdata partition filesystem module
+ // Name of the userdata partition filesystem module
Userdata_partition_name *string
}
@@ -62,7 +68,7 @@
func (a *androidDevice) DepsMutator(ctx android.BottomUpMutatorContext) {
addDependencyIfDefined := func(dep *string) {
if dep != nil {
- ctx.AddDependency(ctx.Module(), filesystemDepTag, proptools.String(dep))
+ ctx.AddFarVariationDependencies(nil, filesystemDepTag, proptools.String(dep))
}
}
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index a2840b5..0160159 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -211,6 +211,18 @@
if android.InList("userdata", f.properties.Generated_partition_types) {
partitionProps.Userdata_partition_name = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "userdata"))
}
+ if android.InList("recovery", f.properties.Generated_partition_types) {
+ partitionProps.Recovery_partition_name = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "recovery"))
+ }
+ if f.properties.Boot_image != "" {
+ partitionProps.Boot_partition_name = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "boot"))
+ }
+ if f.properties.Vendor_boot_image != "" {
+ partitionProps.Vendor_boot_partition_name = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "vendor_boot"))
+ }
+ if f.properties.Init_boot_image != "" {
+ partitionProps.Init_boot_partition_name = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "init_boot"))
+ }
partitionProps.Vbmeta_partitions = vbmetaPartitions
ctx.CreateModule(filesystem.AndroidDeviceFactory, baseProps, partitionProps)