Merge "Specify options_file in vendor_ramdisk prebuilt_kernel module" into main (09245f91) · Commits · e / os / android_build_soong

android/variable.go

+1 −0

Original line number	Diff line number	Diff line
		@@ -664,6 +664,7 @@ type PartitionVariables struct {
		VendorRamdiskKernelModules []string `json:",omitempty"`
		VendorRamdiskKernelBlocklistFile string `json:",omitempty"`
		VendorRamdiskKernelLoadModules []string `json:",omitempty"`
		VendorRamdiskKernelOptionsFile string `json:",omitempty"`
		}

		func boolPtr(v bool) *bool {

+5 −0

Original line number	Diff line number	Diff line
		@@ -507,6 +507,7 @@ func (f *filesystemCreator) createPrebuiltKernelModules(ctx android.LoadHookCont
		Vendor_ramdisk *bool
		Load_by_default *bool
		Blocklist_file *string
		Options_file *string
		}{
		Name: proptools.StringPtr(name),
		}
		@@ -543,6 +544,10 @@ func (f *filesystemCreator) createPrebuiltKernelModules(ctx android.LoadHookCont
		if blocklistFile := ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.VendorRamdiskKernelBlocklistFile; blocklistFile != "" {
		props.Blocklist_file = proptools.StringPtr(blocklistFile)
		}
		if optionsFile := ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.VendorRamdiskKernelOptionsFile; optionsFile != "" {
		props.Options_file = proptools.StringPtr(optionsFile)
		}

		default:
		ctx.ModuleErrorf("DLKM is not supported for %s\n", partitionType)
		}