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

Merge "Expose android.filesToInstall" am: c8821b9451 am: 95069b99bf am: 25740a000c

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

Change-Id: Ieaa9cecb6146ccf3f88baa7d4a53e875747bdcaf
This commit is contained in:
Treehugger Robot
2020-10-13 05:58:17 +00:00
committed by Automerger Merge Worker
parent a8ccc7c642 25740a000c
commit 449972d308
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/module.go
View File

@@ -435,7 +435,7 @@ type Module interface {
HostRequiredModuleNames() []string HostRequiredModuleNames() []string
TargetRequiredModuleNames() []string TargetRequiredModuleNames() []string
filesToInstall() InstallPaths FilesToInstall() InstallPaths
} }
// Qualified id for a module // Qualified id for a module
@@ -1241,14 +1241,14 @@ func (m *ModuleBase) computeInstallDeps(ctx blueprint.ModuleContext) InstallPath
// TODO(ccross): we need to use WalkDeps and have some way to know which dependencies require installation // TODO(ccross): we need to use WalkDeps and have some way to know which dependencies require installation
ctx.VisitDepsDepthFirst(func(m blueprint.Module) { ctx.VisitDepsDepthFirst(func(m blueprint.Module) {
if a, ok := m.(Module); ok { if a, ok := m.(Module); ok {
result = append(result, a.filesToInstall()...) result = append(result, a.FilesToInstall()...)
} }
}) })
return result return result
} }
func (m *ModuleBase) filesToInstall() InstallPaths { func (m *ModuleBase) FilesToInstall() InstallPaths {
return m.installFiles return m.installFiles
} }

2
android/test_suites.go
View File

@@ -41,7 +41,7 @@ func (t *testSuiteFiles) GenerateBuildActions(ctx SingletonContext) {
files[testSuite] = make(map[string]InstallPaths) files[testSuite] = make(map[string]InstallPaths)
} }
name := ctx.ModuleName(m) name := ctx.ModuleName(m)
files[testSuite][name] = append(files[testSuite][name], tsm.filesToInstall()...) files[testSuite][name] = append(files[testSuite][name], tsm.FilesToInstall()...)
} }
} }
}) })