Fix checkbuild for modules with last variant disabled

The soong checkbuild target is created by the last varaint of each
module.  Don't return early if the variant is disabled, which would
prevent creating the checkbuild target.

Test: m -j checkbuild
Change-Id: Ib260bae7fb4be7255f5c1b34dfbd50225f308005

1 files changed, 12 insertions, 16 deletions

diff --git a/android/module.go b/android/module.go
index e415c0a5..95bd9ea0 100644
--- a/android/module.go
+++ b/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,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.module.GenerateAndroidBuildActions(androidCtx)
-	if ctx.Failed() {
-		return
+		a.installFiles = append(a.installFiles, androidCtx.installFiles...)
+		a.checkbuildFiles = append(a.checkbuildFiles, androidCtx.checkbuildFiles...)
 	}
 
-	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
+		}
 	}
 }