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

Fix checkbuild files on last variant

Browse Source 
The context checkbuild files were not copied to the module checkbuild
files before calling generateModuleTarget, which would cause them
to not be considered, and in the case of a module with a single
variant, cause a build failure when the checkbuild target was skipped.

Change-Id: I77faafdc1a8a866e3c2c1157f987015b553acf01
This commit is contained in:
Colin Cross
2015-03-26 16:10:12 -07:00
parent 1f8f234c33
commit c940435029
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/module.go
View File

@@ -254,12 +254,9 @@ func (a *AndroidModuleBase) generateModuleTarget(ctx blueprint.ModuleContext) {
allInstalledFiles := []string{}
allCheckbuildFiles := []string{}
ctx.VisitAllModuleVariants(func(module blueprint.Module) {
if androidModule, ok := module.(AndroidModule); ok {
files := androidModule.base().installFiles
allInstalledFiles = append(allInstalledFiles, files...)
files = androidModule.base().checkbuildFiles
allCheckbuildFiles = append(allCheckbuildFiles, files...)
}
a := module.(AndroidModule).base()
allInstalledFiles = append(allInstalledFiles, a.installFiles...)
allCheckbuildFiles = append(allCheckbuildFiles, a.checkbuildFiles...)
})
deps := []string{}
@@ -329,13 +326,13 @@ func (a *AndroidModuleBase) GenerateBuildActions(ctx blueprint.ModuleContext) {
return
}
a.installFiles = append(a.installFiles, androidCtx.installFiles...)
a.checkbuildFiles = append(a.checkbuildFiles, androidCtx.checkbuildFiles...)
a.generateModuleTarget(ctx)
if ctx.Failed() {
return
}
a.installFiles = append(a.installFiles, androidCtx.installFiles...)
a.checkbuildFiles = append(a.checkbuildFiles, androidCtx.checkbuildFiles...)
}
type androidBaseContextImpl struct {