diff options
| author | 2024-11-27 02:08:49 +0000 | |
|---|---|---|
| committer | 2024-11-27 02:08:49 +0000 | |
| commit | 9e1ce5fa3f2575e1e68d2eb6890d082c7b1c7e8e (patch) | |
| tree | fc699d7a3fc28148dc6dad9d299009725436f557 /kernel/prebuilt_kernel_modules.go | |
| parent | 5c5dc9dce3df18029df755cc303eb82267645a34 (diff) | |
| parent | f6b5e8fbb8d05aa2aab6e4e0eb452d3de83b58e4 (diff) | |
Merge "Specify correct install location for vendor_ramdisk prebuilt kernel module" into main
Diffstat (limited to 'kernel/prebuilt_kernel_modules.go')
| -rw-r--r-- | kernel/prebuilt_kernel_modules.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/prebuilt_kernel_modules.go b/kernel/prebuilt_kernel_modules.go index 13d648235..249045517 100644 --- a/kernel/prebuilt_kernel_modules.go +++ b/kernel/prebuilt_kernel_modules.go @@ -100,6 +100,13 @@ func (pkm *prebuiltKernelModules) GenerateAndroidBuildActions(ctx android.Module strippedModules := stripDebugSymbols(ctx, modules) installDir := android.PathForModuleInstall(ctx, "lib", "modules") + // Kernel module is installed to vendor_ramdisk/lib/modules regardless of product + // configuration. This matches the behavior in make and prevents the files from being + // installed in `vendor_ramdisk/first_stage_ramdisk`. + if pkm.InstallInVendorRamdisk() { + installDir = android.PathForModuleInPartitionInstall(ctx, "vendor_ramdisk", "lib", "modules") + } + if pkm.KernelVersion() != "" { installDir = installDir.Join(ctx, pkm.KernelVersion()) } |