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

Commit 0a9d9d6a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Do not attempt to generate prebuilt_kernel_modules if they are not src" into main

parents 1cce0198 59ee5d7c

fsgen/filesystem_creator.go

+3 −3
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ func (f *filesystemCreator) createPrebuiltKernelModules(ctx android.LoadHookCont 
	}

	switch partitionType {

	case "system_dlkm":

		props.Srcs = ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.SystemKernelModules

		props.Srcs = android.ExistentPathsForSources(ctx, ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.SystemKernelModules).Strings()

		props.System_dlkm_specific = proptools.BoolPtr(true)

		if len(ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.SystemKernelLoadModules) == 0 {

			// Create empty modules.load file for system
@@ -370,7 +370,7 @@ func (f *filesystemCreator) createPrebuiltKernelModules(ctx android.LoadHookCont 
			props.Blocklist_file = proptools.StringPtr(blocklistFile)

		}

	case "vendor_dlkm":

		props.Srcs = ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.VendorKernelModules

		props.Srcs = android.ExistentPathsForSources(ctx, ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.VendorKernelModules).Strings()

		if len(ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.SystemKernelModules) > 0 {

			props.System_deps = []string{":" + generatedModuleName(ctx.Config(), "system_dlkm-kernel-modules") + "{.modules}"}

		}
@@ -379,7 +379,7 @@ func (f *filesystemCreator) createPrebuiltKernelModules(ctx android.LoadHookCont 
			props.Blocklist_file = proptools.StringPtr(blocklistFile)

		}

	case "odm_dlkm":

		props.Srcs = ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.OdmKernelModules

		props.Srcs = android.ExistentPathsForSources(ctx, ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.OdmKernelModules).Strings()

		props.Odm_dlkm_specific = proptools.BoolPtr(true)

		if blocklistFile := ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.OdmKernelBlocklistFile; blocklistFile != "" {

			props.Blocklist_file = proptools.StringPtr(blocklistFile)