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

Generate actions when building the module graph. am: eb0454b2a4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1870487

Change-Id: Iaccbb39e6b53ee8f967e29b78b6d9394d30fd6fb
This commit is contained in:
Lukacs T. Berki
2021-10-26 13:55:21 +00:00
committed by Automerger Merge Worker
parent ae3cdab066 eb0454b2a4
commit 893308aa08
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/soong_build/main.go
View File

@@ -217,15 +217,6 @@ func doChosenActivity(configuration android.Config, extraNinjaDeps []string) str
generateModuleGraphFile := moduleGraphFile != "" generateModuleGraphFile := moduleGraphFile != ""
generateDocFile := docFile != "" generateDocFile := docFile != ""
blueprintArgs := cmdlineArgs
var stopBefore bootstrap.StopBefore
if !generateModuleGraphFile && !generateQueryView && !generateDocFile {
stopBefore = bootstrap.DoEverything
} else {
stopBefore = bootstrap.StopBeforePrepareBuildActions
}
if generateBazelWorkspace { if generateBazelWorkspace {
// Run the alternate pipeline of bp2build mutators and singleton to convert // Run the alternate pipeline of bp2build mutators and singleton to convert
// Blueprint to BUILD files before everything else. // Blueprint to BUILD files before everything else.
@@ -233,6 +224,19 @@ func doChosenActivity(configuration android.Config, extraNinjaDeps []string) str
return bp2buildMarker 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) ctx := newContext(configuration)
if mixedModeBuild { if mixedModeBuild {
runMixedModeBuild(configuration, ctx, extraNinjaDeps) runMixedModeBuild(configuration, ctx, extraNinjaDeps)