diff options
author | 2024-11-27 00:33:30 +0000 | |
---|---|---|
committer | 2024-11-27 00:33:30 +0000 | |
commit | f6b5e8fbb8d05aa2aab6e4e0eb452d3de83b58e4 (patch) | |
tree | 6ec0ba735b44b209d47384c8d2da9a9d19ea8de9 /kernel | |
parent | 60c23299f02ab9268c7957dc9315fe79f7a8b23b (diff) |
Specify correct install location for vendor_ramdisk prebuilt kernel module
vendor_ramdisk prebuilt kernel files are installed under
`vendor_ramdisk/lib/modules` regardless of the product configuration in
make. This change matches the behavior and allows the kernel files to be
installed in the correct location.
Test: m soong_generated_vendor_ramdisk_filesystem_test
Bug: 381104942
Change-Id: Id2086de95f0554c849c1667ce190274232db6b99
Diffstat (limited to 'kernel')
-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()) } |