Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 599992bc authored by Jiyong Park's avatar Jiyong Park
Browse files

Install ko to /lib/modules 

... not to /lib/module

Bug: 178980227
Test: m
Change-Id: I6a5357e9e83e736181b885b64c76e0b7e5ffadf2
parent 940dfd4d

kernel/prebuilt_kernel_modules.go

+1 −1
Original line number Diff line number Diff line
@@ -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())

	}

kernel/prebuilt_kernel_modules_test.go

+6 −6
Original line number Diff line number Diff line
@@ -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