diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go index c5e889664..e9eabd37c 100644 --- a/cmd/soong_build/main.go +++ b/cmd/soong_build/main.go @@ -217,15 +217,6 @@ func doChosenActivity(configuration android.Config, extraNinjaDeps []string) str generateModuleGraphFile := moduleGraphFile != "" generateDocFile := docFile != "" - blueprintArgs := cmdlineArgs - - var stopBefore bootstrap.StopBefore - if !generateModuleGraphFile && !generateQueryView && !generateDocFile { - stopBefore = bootstrap.DoEverything - } else { - stopBefore = bootstrap.StopBeforePrepareBuildActions - } - if generateBazelWorkspace { // Run the alternate pipeline of bp2build mutators and singleton to convert // Blueprint to BUILD files before everything else. @@ -233,6 +224,19 @@ func doChosenActivity(configuration android.Config, extraNinjaDeps []string) str return bp2buildMarker } + blueprintArgs := cmdlineArgs + + var stopBefore bootstrap.StopBefore + if generateModuleGraphFile { + stopBefore = bootstrap.StopBeforeWriteNinja + } else if generateQueryView { + stopBefore = bootstrap.StopBeforePrepareBuildActions + } else if generateDocFile { + stopBefore = bootstrap.StopBeforePrepareBuildActions + } else { + stopBefore = bootstrap.DoEverything + } + ctx := newContext(configuration) if mixedModeBuild { runMixedModeBuild(configuration, ctx, extraNinjaDeps)