Fix checkbuild for modules with last variant disabled

am: 9b1d13db73

Change-Id: I19c368bdce8e7822c21a6a3ede4ee7f9891d7c9a

android/module.go

@@ -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,10 +435,7 @@ func (a *ModuleBase) GenerateBuildActions(ctx blueprint.ModuleContext) {
 		missingDeps:            ctx.GetMissingDependencies(),
 	}
 
-	if !a.Enabled() {
+	if a.Enabled() {
-		return
-	}
-
 		a.module.GenerateAndroidBuildActions(androidCtx)
 		if ctx.Failed() {
 			return
@@ -450,12 +443,15 @@ func (a *ModuleBase) GenerateBuildActions(ctx blueprint.ModuleContext) {
 
 		a.installFiles = append(a.installFiles, androidCtx.installFiles...)
 		a.checkbuildFiles = append(a.checkbuildFiles, androidCtx.checkbuildFiles...)
+	}
 
+	if a == ctx.FinalModule().(Module).base() {
 		a.generateModuleTarget(ctx)
 		if ctx.Failed() {
 			return
 		}
 	}
+}
 
 type androidBaseContextImpl struct {
 	target        Target