Merge "Specify options_file in vendor_ramdisk prebuilt_kernel module" into main am: 09245f9105 am: cdda931f93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3377151
Change-Id: I3304c67679982375eb0d379d8aab08e4a105f49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/variable.go b/android/variable.go
index bec1131..9043037 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -665,6 +665,7 @@
VendorRamdiskKernelModules []string `json:",omitempty"`
VendorRamdiskKernelBlocklistFile string `json:",omitempty"`
VendorRamdiskKernelLoadModules []string `json:",omitempty"`
+ VendorRamdiskKernelOptionsFile string `json:",omitempty"`
}
func boolPtr(v bool) *bool {
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index 556c4dc..8325b1e 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -507,6 +507,7 @@
Vendor_ramdisk *bool
Load_by_default *bool
Blocklist_file *string
+ Options_file *string
}{
Name: proptools.StringPtr(name),
}
@@ -543,6 +544,10 @@
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)
}