Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54de178b authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Remove unnecessary base_dir property value overrides 

base_dir property value defaults to the name of the partition, in
generateFsProps, and does not need to be overriden unless the value
differs from the name of the partition.

Test: m soong_generated_system_filesystem_test
Change-Id: I60165905beb48745158310d8904d649d49767ce0
parent d74bf29d

fsgen/filesystem_creator.go

+0 −3
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ func partitionSpecificFsProps(fsProps *filesystem.FilesystemProperties, partitio 
				Name:   proptools.StringPtr("system/lib/modules"),

			},

		}

		fsProps.Base_dir = proptools.StringPtr("system")

	case "system_ext":

		fsProps.Fsverity.Inputs = []string{

			"framework/*",
@@ -197,7 +196,6 @@ func partitionSpecificFsProps(fsProps *filesystem.FilesystemProperties, partitio 
				Name:   proptools.StringPtr("vendor/lib/modules"),

			},

		}

		fsProps.Base_dir = proptools.StringPtr("vendor")

	case "odm":

		fsProps.Symlinks = []filesystem.SymlinkDefinition{

			filesystem.SymlinkDefinition{
@@ -205,7 +203,6 @@ func partitionSpecificFsProps(fsProps *filesystem.FilesystemProperties, partitio 
				Name:   proptools.StringPtr("odm/lib/modules"),

			},

		}

		fsProps.Base_dir = proptools.StringPtr("odm")

	case "userdata":

		fsProps.Base_dir = proptools.StringPtr("data")