diff options
| author | 2021-02-04 19:40:56 +0900 | |
|---|---|---|
| committer | 2021-02-05 00:29:47 +0900 | |
| commit | 599992bc3e6795b94949eefd36e5812df237d03a (patch) | |
| tree | c8b6cb8ad551336898a8347f68fa1062d3b531a9 /kernel | |
| parent | 940dfd4db2d73368e20c29a086e4ef9a1d3b1ca0 (diff) | |
Install ko to /lib/modules
... not to /lib/module
Bug: 178980227
Test: m
Change-Id: I6a5357e9e83e736181b885b64c76e0b7e5ffadf2
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/prebuilt_kernel_modules.go | 2 | ||||
| -rw-r--r-- | kernel/prebuilt_kernel_modules_test.go | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kernel/prebuilt_kernel_modules.go b/kernel/prebuilt_kernel_modules.go index 94e04cbc2..14ac02148 100644 --- a/kernel/prebuilt_kernel_modules.go +++ b/kernel/prebuilt_kernel_modules.go @@ -72,7 +72,7 @@ func (pkm *prebuiltKernelModules) GenerateAndroidBuildActions(ctx android.Module depmodOut := runDepmod(ctx, modules) strippedModules := stripDebugSymbols(ctx, modules) - installDir := android.PathForModuleInstall(ctx, "lib", "module") + installDir := android.PathForModuleInstall(ctx, "lib", "modules") if pkm.KernelVersion() != "" { installDir = installDir.Join(ctx, pkm.KernelVersion()) } diff --git a/kernel/prebuilt_kernel_modules_test.go b/kernel/prebuilt_kernel_modules_test.go index b49e1679c..433548bc0 100644 --- a/kernel/prebuilt_kernel_modules_test.go +++ b/kernel/prebuilt_kernel_modules_test.go @@ -84,12 +84,12 @@ func TestKernelModulesFilelist(t *testing.T) { }) expected := []string{ - "lib/module/5.10/mod1.ko", - "lib/module/5.10/mod2.ko", - "lib/module/5.10/modules.load", - "lib/module/5.10/modules.dep", - "lib/module/5.10/modules.softdep", - "lib/module/5.10/modules.alias", + "lib/modules/5.10/mod1.ko", + "lib/modules/5.10/mod2.ko", + "lib/modules/5.10/modules.load", + "lib/modules/5.10/modules.dep", + "lib/modules/5.10/modules.softdep", + "lib/modules/5.10/modules.alias", } var actual []string |