Merge "Create prebuilt kernel module for vendor_ramdisk partition" into main (9138df77) · Commits · e / os / android_build_soong

android/variable.go

+4 −0

Original line number	Diff line number	Diff line
		@@ -660,6 +660,10 @@ type PartitionVariables struct {
		BuildingOdmDlkmImage bool `json:",omitempty"`
		OdmKernelModules []string `json:",omitempty"`
		OdmKernelBlocklistFile string `json:",omitempty"`

		VendorRamdiskKernelModules []string `json:",omitempty"`
		VendorRamdiskKernelBlocklistFile string `json:",omitempty"`
		VendorRamdiskKernelLoadModules []string `json:",omitempty"`
		}

		func boolPtr(v bool) *bool {

+8 −1

Original line number	Diff line number	Diff line
		@@ -427,7 +427,7 @@ func (f *filesystemCreator) createPartition(ctx android.LoadHookContext, partiti
		}
		}

		if android.InList(partitionType, dlkmPartitions) {
		if android.InList(partitionType, append(dlkmPartitions, "vendor_ramdisk")) {
		f.createPrebuiltKernelModules(ctx, partitionType)
		}

		@@ -504,6 +504,7 @@ func (f *filesystemCreator) createPrebuiltKernelModules(ctx android.LoadHookCont
		System_dlkm_specific *bool
		Vendor_dlkm_specific *bool
		Odm_dlkm_specific *bool
		Vendor_ramdisk *bool
		Load_by_default *bool
		Blocklist_file *string
		}{
		@@ -536,6 +537,12 @@ func (f *filesystemCreator) createPrebuiltKernelModules(ctx android.LoadHookCont
		if blocklistFile := ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.OdmKernelBlocklistFile; blocklistFile != "" {
		props.Blocklist_file = proptools.StringPtr(blocklistFile)
		}
		case "vendor_ramdisk":
		props.Srcs = android.ExistentPathsForSources(ctx, ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.VendorRamdiskKernelModules).Strings()
		props.Vendor_ramdisk = proptools.BoolPtr(true)
		if blocklistFile := ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.VendorRamdiskKernelBlocklistFile; blocklistFile != "" {
		props.Blocklist_file = proptools.StringPtr(blocklistFile)
		}
		default:
		ctx.ModuleErrorf("DLKM is not supported for %s\n", partitionType)
		}