Merge "Revert "Autogenerate a vendor/ partition"" into main (df29b893) · Commits · e / os / android_build_soong

fsgen/filesystem_creator.go

+1 −7

Original line number	Diff line number	Diff line
		@@ -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)
		}