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

Commit 364da361 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I6a5357e9,I199f070e 

* changes:
  Install ko to /lib/modules
  android_filesystem is OutputFileProducer
parents 87bd0f3c 599992bc

filesystem/filesystem.go

+10 −0
Original line number Diff line number Diff line
@@ -271,6 +271,16 @@ func (f *filesystem) AndroidMkEntries() []android.AndroidMkEntries { 
	}}

}



var _ android.OutputFileProducer = (*filesystem)(nil)



// Implements android.OutputFileProducer

func (f *filesystem) OutputFiles(tag string) (android.Paths, error) {

	if tag == "" {

		return []android.Path{f.output}, nil

	}

	return nil, fmt.Errorf("unsupported module reference tag %q", tag)

}



// Filesystem is the public interface for the filesystem struct. Currently, it's only for the apex

// package to have access to the output file.

type Filesystem interface {

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