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

Commit a48f2754 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add fs_config_files/fs_config_dirs/build_prop to system_dlkm" into main am: ed04b5e5 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3341319



Change-Id: I224ece61cf536fb40d59264407be6d6d58c2f1b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ee5b35f ed04b5e5

fsgen/filesystem_creator.go

+8 −7
Original line number Diff line number Diff line
@@ -234,11 +234,6 @@ func (f *filesystemCreator) createPartition(ctx android.LoadHookContext, partiti 
	var module android.Module

	if partitionType == "system" {

		module = ctx.CreateModule(filesystem.SystemImageFactory, baseProps, fsProps)

	} else if partitionType == "system_dlkm" {

		// Do not set partition_type. build/soong/android/paths#modulePartition currently does not support dlkm

		// partitions. Since `android_filesystem` uses a partition based filter, setting the partition here

		// would result in missing in entries.

		module = ctx.CreateModule(filesystem.FilesystemFactory, baseProps, fsProps)

	} else {

		// Explicitly set the partition.

		fsProps.Partition_type = proptools.StringPtr(partitionType)
@@ -262,10 +257,16 @@ func (f *filesystemCreator) createPrebuiltKernelModules(ctx android.LoadHookCont 
	props := &struct {

		Name                 *string

		Srcs                 []string

		System_dlkm_specific *bool

		Vendor_dlkm_specific *bool // TODO (b/377562851)

		Odm_dlkm_specific    *bool // TODO (b/377563262)

	}{

		Name: proptools.StringPtr(name),

		Srcs: kernelModules,

	}

	if partitionType == "system_dlkm" {

		props.System_dlkm_specific = proptools.BoolPtr(true)

	}

	kernelModule := ctx.CreateModuleInDirectory(

		kernel.PrebuiltKernelModulesFactory,

		".", // create in root directory for now

fsgen/fsgen_mutators.go

+8 −2
Original line number Diff line number Diff line
@@ -146,8 +146,14 @@ func createFsGenState(ctx android.LoadHookContext, generatedPrebuiltEtcModuleNam 
					"com.android.vndk.v33": defaultDepCandidateProps(ctx.Config()),

					"com.android.vndk.v34": defaultDepCandidateProps(ctx.Config()),

				},

				"system_dlkm": {},

				"userdata": {},

				"system_dlkm": {

					// these are phony required deps of the phony fs_config_dirs_nonsystem

					"fs_config_dirs_system_dlkm":  defaultDepCandidateProps(ctx.Config()),

					"fs_config_files_system_dlkm": defaultDepCandidateProps(ctx.Config()),

					// build props are automatically added to `ALL_DEFAULT_INSTALLED_MODULES`

					"system_dlkm-build.prop": defaultDepCandidateProps(ctx.Config()),

				},

			},

			fsDepsMutex:               sync.Mutex{},

			moduleToInstallationProps: map[string]installationProperties{},