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

Commit 69464c3d authored by Spandan Das's avatar Spandan Das
Browse files

Install cross partition symlinks in autogenerated vendor.img 

These match the symlinks present in the kati built vendor.img file.

Since structs are not supported in `generateBpContent`, Android.bp
generation for vendor is skipped for now.

Bug: 374371755
Test: Verified that odm and lib/modules are present in vendor.img's
fileList for aosp_cf_x86_64_phone

Change-Id: I2564d23a5fc3b8e1aad360373ff2c103a074cfe7
parent 2ffaad10

filesystem/filesystem.go

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ type filesystem struct { 
	entries []string

}



type symlinkDefinition struct {

type SymlinkDefinition struct {

	Target *string

	Name   *string

}
@@ -111,7 +111,7 @@ type FilesystemProperties struct { 
	Dirs proptools.Configurable[[]string]



	// Symbolic links to be created under root with "ln -sf <target> <name>".

	Symlinks []symlinkDefinition

	Symlinks []SymlinkDefinition



	// Seconds since unix epoch to override timestamps of file entries

	Fake_timestamp *string

fsgen/filesystem_creator.go

+14 −0
Original line number Diff line number Diff line
@@ -387,6 +387,17 @@ func partitionSpecificFsProps(fsProps *filesystem.FilesystemProperties, partitio 
		fsProps.Gen_aconfig_flags_pb = proptools.BoolPtr(true)

	case "vendor":

		fsProps.Gen_aconfig_flags_pb = proptools.BoolPtr(true)

		fsProps.Symlinks = []filesystem.SymlinkDefinition{

			filesystem.SymlinkDefinition{

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

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

			},

			filesystem.SymlinkDefinition{

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

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

			},

		}

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

	}

}
@@ -563,6 +574,9 @@ func generateBpContent(ctx android.EarlyModuleContext, partitionType string) str 
	if !fsTypeSupported {

		return ""

	}

	if partitionType == "vendor" {

		return "" // TODO: Handle struct props

	}



	baseProps := generateBaseProps(proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), partitionType)))

	deps := ctx.Config().Get(fsGenStateOnceKey).(*FsGenState).fsDeps[partitionType]