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

Commit 9afc298e authored by mrziwang's avatar mrziwang Committed by Zi Wang
Browse files

Handle several symlinks in system image generation 

The symlinks below are added in fsProps:
system/product to /product
system/system_ext to /system_ext
system/vendor to /vendor
system/lib/modules to /system_dlkm/lib/modules

Test: CI and soong_generated_system_filesystem_test
Bug: 376490670
Change-Id: Ia1594e27593fce2e34e9601bc0516892fc33a3f7
parent b3147242

fsgen/filesystem_creator.go

+20 −0
Original line number Diff line number Diff line
@@ -136,6 +136,26 @@ func partitionSpecificFsProps(fsProps *filesystem.FilesystemProperties, partitio 
			"framework/oat/*/*", // framework/oat/{arch}

		}

		fsProps.Fsverity.Libs = []string{":framework-res{.export-package.apk}"}

		// TODO(b/377734331): only generate the symlinks if the relevant partitions exist

		fsProps.Symlinks = []filesystem.SymlinkDefinition{

			filesystem.SymlinkDefinition{

				Target: proptools.StringPtr("/product"),

				Name:   proptools.StringPtr("system/product"),

			},

			filesystem.SymlinkDefinition{

				Target: proptools.StringPtr("/system_ext"),

				Name:   proptools.StringPtr("system/system_ext"),

			},

			filesystem.SymlinkDefinition{

				Target: proptools.StringPtr("/vendor"),

				Name:   proptools.StringPtr("system/vendor"),

			},

			filesystem.SymlinkDefinition{

				Target: proptools.StringPtr("/system_dlkm/lib/modules"),

				Name:   proptools.StringPtr("system/lib/modules"),

			},

		}

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

	case "system_ext":

		fsProps.Fsverity.Inputs = []string{

			"framework/*",