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

Commit 71dc1f81 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Specify correct install location for vendor_ramdisk prebuilt kernel... 

Merge "Specify correct install location for vendor_ramdisk prebuilt kernel module" into main am: 9e1ce5fa

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3375800



Change-Id: I93ccca0c3ca3a6fe74429de0d7001d7c70bba52b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af3fd511 9e1ce5fa

kernel/prebuilt_kernel_modules.go

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

	}