Generate actions when building the module graph. am: eb0454b2a4
am: 893308aa08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1870487 Change-Id: Ia5c87cae53ab7dd1a2cb0e718ceffadc7d92a3fd
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user