StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I6a5357e9,I199f070e am: 364da36115

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id50f6a4d03a7f740e9815d5b6fd1d1df5ff66dca
This commit is contained in:
Treehugger Robot
2021-02-05 04:34:53 +00:00
committed by Automerger Merge Worker
parent 7ca0af1e40 364da36115
commit f0cdd375ad
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
filesystem/filesystem.go
View File

@@ -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 // Filesystem is the public interface for the filesystem struct. Currently, it's only for the apex
// package to have access to the output file. // package to have access to the output file.
type Filesystem interface { type Filesystem interface {

2
kernel/prebuilt_kernel_modules.go
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())
} }

12
kernel/prebuilt_kernel_modules_test.go
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