diff options
| author | 2024-11-27 01:13:54 +0000 | |
|---|---|---|
| committer | 2024-11-27 01:13:54 +0000 | |
| commit | aedc895394f1b1ae76d28e158a12d3dbe7e6108c (patch) | |
| tree | a89d7f5068b7e3e8b8123c1eb77a559679e524d9 /fsgen/filesystem_creator.go | |
| parent | 195efeb410a618135f866730c053a8d01698feba (diff) | |
| parent | 9138df77ce4432a6598e1287752bb76bc2241f8b (diff) | |
Merge "Create prebuilt kernel module for vendor_ramdisk partition" into main am: 9138df77ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3375799
Change-Id: Ifd0581abdf8f9dc5c397433f239e12922b496178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'fsgen/filesystem_creator.go')
| -rw-r--r-- | fsgen/filesystem_creator.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index caf92e2be..556c4dcc9 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -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) } |