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

Do not pass the list of deps to RunBlueprint.

Browse Source 
It was only appended to the return value, which can be done by the
caller just as well.

Test: Presubmit.
Change-Id: I962696e0dbd4c3496a0159d01d2a911675fd4217
This commit is contained in:
Lukacs T. Berki
2021-04-15 15:06:40 +02:00
parent a52ae26e91
commit 6124c9b36e
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/soong_build/main.go
View File

@@ -108,7 +108,7 @@ func runMixedModeBuild(configuration android.Config, firstCtx *android.Context,
firstArgs = bootstrap.CmdlineArgs firstArgs = bootstrap.CmdlineArgs
configuration.SetStopBefore(bootstrap.StopBeforeWriteNinja) configuration.SetStopBefore(bootstrap.StopBeforeWriteNinja)
bootstrap.RunBlueprint(firstArgs, firstCtx.Context, configuration, extraNinjaDeps...) bootstrap.RunBlueprint(firstArgs, firstCtx.Context, configuration)
// Invoke bazel commands and save results for second pass. // Invoke bazel commands and save results for second pass.
if err := configuration.BazelContext.InvokeBazel(); err != nil { if err := configuration.BazelContext.InvokeBazel(); err != nil {
@@ -123,7 +123,8 @@ func runMixedModeBuild(configuration android.Config, firstCtx *android.Context,
} }
secondCtx := newContext(secondConfig, true) secondCtx := newContext(secondConfig, true)
secondArgs = bootstrap.CmdlineArgs secondArgs = bootstrap.CmdlineArgs
ninjaDeps := bootstrap.RunBlueprint(secondArgs, secondCtx.Context, secondConfig, extraNinjaDeps...) ninjaDeps := bootstrap.RunBlueprint(secondArgs, secondCtx.Context, secondConfig)
ninjaDeps = append(ninjaDeps, extraNinjaDeps...)
err = deptools.WriteDepFile(shared.JoinPath(topDir, secondArgs.DepFile), secondArgs.OutFile, ninjaDeps) err = deptools.WriteDepFile(shared.JoinPath(topDir, secondArgs.DepFile), secondArgs.OutFile, ninjaDeps)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "Error writing depfile '%s': %s\n", secondArgs.DepFile, err) fmt.Fprintf(os.Stderr, "Error writing depfile '%s': %s\n", secondArgs.DepFile, err)
@@ -141,10 +142,10 @@ func runQueryView(configuration android.Config, ctx *android.Context) {
} }
} }
func runSoongDocs(configuration android.Config, extraNinjaDeps []string) { func runSoongDocs(configuration android.Config) {
ctx := newContext(configuration, false) ctx := newContext(configuration, false)
soongDocsArgs := bootstrap.CmdlineArgs soongDocsArgs := bootstrap.CmdlineArgs
bootstrap.RunBlueprint(soongDocsArgs, ctx.Context, configuration, extraNinjaDeps...) bootstrap.RunBlueprint(soongDocsArgs, ctx.Context, configuration)
if err := writeDocs(ctx, configuration, docFile); err != nil { if err := writeDocs(ctx, configuration, docFile); err != nil {
fmt.Fprintf(os.Stderr, "%s", err) fmt.Fprintf(os.Stderr, "%s", err)
os.Exit(1) os.Exit(1)
@@ -195,7 +196,8 @@ func doChosenActivity(configuration android.Config, extraNinjaDeps []string) str
if mixedModeBuild { if mixedModeBuild {
runMixedModeBuild(configuration, ctx, extraNinjaDeps) runMixedModeBuild(configuration, ctx, extraNinjaDeps)
} else { } else {
ninjaDeps := bootstrap.RunBlueprint(blueprintArgs, ctx.Context, configuration, extraNinjaDeps...) ninjaDeps := bootstrap.RunBlueprint(blueprintArgs, ctx.Context, configuration)
ninjaDeps = append(ninjaDeps, extraNinjaDeps...)
err := deptools.WriteDepFile(shared.JoinPath(topDir, blueprintArgs.DepFile), blueprintArgs.OutFile, ninjaDeps) err := deptools.WriteDepFile(shared.JoinPath(topDir, blueprintArgs.DepFile), blueprintArgs.OutFile, ninjaDeps)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "Error writing depfile '%s': %s\n", blueprintArgs.DepFile, err) fmt.Fprintf(os.Stderr, "Error writing depfile '%s': %s\n", blueprintArgs.DepFile, err)
@@ -278,7 +280,7 @@ func main() {
// thus it would overwrite the actual used variables file so this is // thus it would overwrite the actual used variables file so this is
// special-cased. // special-cased.
// TODO: Fix this by not passing --used_env to the soong_docs invocation // TODO: Fix this by not passing --used_env to the soong_docs invocation
runSoongDocs(configuration, extraNinjaDeps) runSoongDocs(configuration)
return return
} }
@@ -387,7 +389,8 @@ func runBp2Build(configuration android.Config, extraNinjaDeps []string) {
// Modules parsed from Android.bp files, and the BazelTargetModules mapped // Modules parsed from Android.bp files, and the BazelTargetModules mapped
// from the regular Modules. // from the regular Modules.
blueprintArgs := bootstrap.CmdlineArgs blueprintArgs := bootstrap.CmdlineArgs
ninjaDeps := bootstrap.RunBlueprint(blueprintArgs, bp2buildCtx.Context, configuration, extraNinjaDeps...) ninjaDeps := bootstrap.RunBlueprint(blueprintArgs, bp2buildCtx.Context, configuration)
ninjaDeps = append(ninjaDeps, extraNinjaDeps...)
for _, globPath := range bp2buildCtx.Globs() { for _, globPath := range bp2buildCtx.Globs() {
ninjaDeps = append(ninjaDeps, globPath.FileListFile(configuration.BuildDir())) ninjaDeps = append(ninjaDeps, globPath.FileListFile(configuration.BuildDir()))