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

Commit 649b3a95 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add a tracking bug for non ext4 FS type support" into main

parents 68c8b38a 94668820

filesystem/filesystem.go

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ func (f *filesystem) buildPropFile(ctx android.ModuleContext) (propFile android. 
	// Type string that build_image.py accepts.

	fsTypeStr := func(t fsType) string {

		switch t {

		// TODO(jiyong): add more types like f2fs, erofs, etc.

		// TODO(372522486): add more types like f2fs, erofs, etc.

		case ext4Type:

			return "ext4"

		}

fsgen/filesystem_creator.go

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ func (f *filesystemCreator) createPartition(ctx android.LoadHookContext, partiti 
	// BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE

	fsProps.Type = proptools.StringPtr(specificPartitionVars.BoardFileSystemType)

	if *fsProps.Type != "ext4" {

		// TODO(b/372522486): Support other FS types.

		// Currently the android_filesystem module type only supports ext4:

		// https://cs.android.com/android/platform/superproject/main/+/main:build/soong/filesystem/filesystem.go;l=416;drc=98047cfd07944b297a12d173453bc984806760d2

		return false