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

Fix checkbuild for modules with last variant disabled

Browse Source 
am: 9b1d13db73

Change-Id: I19c368bdce8e7822c21a6a3ede4ee7f9891d7c9a
This commit is contained in:
Colin Cross
2016-09-20 16:57:14 +00:00
committed by android-build-merger
parent 1bb040ff67 9b1d13db73
commit fed7b92b7e
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
android/module.go
View File

@@ -366,10 +366,6 @@ func (p *ModuleBase) InstallInData() bool {
}
func (a *ModuleBase) generateModuleTarget(ctx blueprint.ModuleContext) {
if a != ctx.FinalModule().(Module).base() {
return
}
allInstalledFiles := Paths{}
allCheckbuildFiles := Paths{}
ctx.VisitAllModuleVariants(func(module blueprint.Module) {
@@ -439,21 +435,21 @@ func (a *ModuleBase) GenerateBuildActions(ctx blueprint.ModuleContext) {
missingDeps: ctx.GetMissingDependencies(),
}
if !a.Enabled() {
return
if a.Enabled() {
a.module.GenerateAndroidBuildActions(androidCtx)
if ctx.Failed() {
return
}
a.installFiles = append(a.installFiles, androidCtx.installFiles...)
a.checkbuildFiles = append(a.checkbuildFiles, androidCtx.checkbuildFiles...)
}
a.module.GenerateAndroidBuildActions(androidCtx)
if ctx.Failed() {
return
}
a.installFiles = append(a.installFiles, androidCtx.installFiles...)
a.checkbuildFiles = append(a.checkbuildFiles, androidCtx.checkbuildFiles...)
a.generateModuleTarget(ctx)
if ctx.Failed() {
return
if a == ctx.FinalModule().(Module).base() {
a.generateModuleTarget(ctx)
if ctx.Failed() {
return
}
}
}