diff options
| author | 2024-10-21 22:56:14 +0000 | |
|---|---|---|
| committer | 2024-10-21 22:56:14 +0000 | |
| commit | df29b893d0298174d360ef239607f22ad5a164e4 (patch) | |
| tree | 3b8da90a41762ab97ae1547778f299090304a708 | |
| parent | 42d608ed2a8983337a8625673919e5603acd9ac1 (diff) | |
| parent | dafaa7f5c1653b27a9339ecfbc869e1484ca4c83 (diff) | |
Merge "Revert "Autogenerate a vendor/ partition"" into main
| -rw-r--r-- | fsgen/filesystem_creator.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index c55910497..6ff9645d2 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -101,9 +101,6 @@ func createFsGenState(ctx android.LoadHookContext) *FsGenState { 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 @@ func (f *filesystemCreator) createDeviceModule(ctx android.LoadHookContext) { 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 @@ func (f *filesystemCreator) createDeviceModule(ctx android.LoadHookContext) { 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) } |