Install ko to /lib/modules

... not to /lib/module

Bug: 178980227
Test: m
Change-Id: I6a5357e9e83e736181b885b64c76e0b7e5ffadf2
This commit is contained in:
Jiyong Park
2021-02-04 19:40:56 +09:00
parent 940dfd4db2
commit 599992bc3e
2 changed files with 7 additions and 7 deletions

View File

@@ -72,7 +72,7 @@ func (pkm *prebuiltKernelModules) GenerateAndroidBuildActions(ctx android.Module
depmodOut := runDepmod(ctx, modules) depmodOut := runDepmod(ctx, modules)
strippedModules := stripDebugSymbols(ctx, modules) strippedModules := stripDebugSymbols(ctx, modules)
installDir := android.PathForModuleInstall(ctx, "lib", "module") installDir := android.PathForModuleInstall(ctx, "lib", "modules")
if pkm.KernelVersion() != "" { if pkm.KernelVersion() != "" {
installDir = installDir.Join(ctx, pkm.KernelVersion()) installDir = installDir.Join(ctx, pkm.KernelVersion())
} }

View File

@@ -84,12 +84,12 @@ func TestKernelModulesFilelist(t *testing.T) {
}) })
expected := []string{ expected := []string{
"lib/module/5.10/mod1.ko", "lib/modules/5.10/mod1.ko",
"lib/module/5.10/mod2.ko", "lib/modules/5.10/mod2.ko",
"lib/module/5.10/modules.load", "lib/modules/5.10/modules.load",
"lib/module/5.10/modules.dep", "lib/modules/5.10/modules.dep",
"lib/module/5.10/modules.softdep", "lib/modules/5.10/modules.softdep",
"lib/module/5.10/modules.alias", "lib/modules/5.10/modules.alias",
} }
var actual []string var actual []string