Merge "Revert "Autogenerate a vendor/ partition"" into main
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index c559104..6ff9645 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -101,9 +101,6 @@
if ctx.DeviceConfig().SystemExtPath() == "system_ext" {
generatedPartitions = append(generatedPartitions, "system_ext")
}
- if ctx.DeviceConfig().VendorPath() == "vendor" {
- generatedPartitions = append(generatedPartitions, "vendor")
- }
return &FsGenState{
depCandidates: candidates,
@@ -335,7 +332,7 @@
Name: proptools.StringPtr(generatedModuleName(ctx.Config(), "device")),
}
- // Currently, only a select set of partitions like system, system_ext is created.
+ // Currently, only the system and system_ext partition module is created.
partitionProps := &filesystem.PartitionNameProperties{}
if android.InList("system", f.properties.Generated_partition_types) {
partitionProps.System_partition_name = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "system"))
@@ -343,9 +340,6 @@
if android.InList("system_ext", f.properties.Generated_partition_types) {
partitionProps.System_ext_partition_name = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "system_ext"))
}
- if android.InList("vendor", f.properties.Generated_partition_types) {
- partitionProps.Vendor_partition_name = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "vendor"))
- }
ctx.CreateModule(filesystem.AndroidDeviceFactory, baseProps, partitionProps)
}