From 6124c9b36e6f66abf3d25840d66a29cccf0da3f6 Mon Sep 17 00:00:00 2001 From: "Lukacs T. Berki" Date: Thu, 15 Apr 2021 15:06:40 +0200 Subject: [PATCH] Do not pass the list of deps to RunBlueprint. It was only appended to the return value, which can be done by the caller just as well. Test: Presubmit. Change-Id: I962696e0dbd4c3496a0159d01d2a911675fd4217 --- cmd/soong_build/main.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go index 1e796ecca..c9cab13f5 100644 --- a/cmd/soong_build/main.go +++ b/cmd/soong_build/main.go @@ -108,7 +108,7 @@ func runMixedModeBuild(configuration android.Config, firstCtx *android.Context, firstArgs = bootstrap.CmdlineArgs 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. if err := configuration.BazelContext.InvokeBazel(); err != nil { @@ -123,7 +123,8 @@ func runMixedModeBuild(configuration android.Config, firstCtx *android.Context, } secondCtx := newContext(secondConfig, true) 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) if err != nil { 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) soongDocsArgs := bootstrap.CmdlineArgs - bootstrap.RunBlueprint(soongDocsArgs, ctx.Context, configuration, extraNinjaDeps...) + bootstrap.RunBlueprint(soongDocsArgs, ctx.Context, configuration) if err := writeDocs(ctx, configuration, docFile); err != nil { fmt.Fprintf(os.Stderr, "%s", err) os.Exit(1) @@ -195,7 +196,8 @@ func doChosenActivity(configuration android.Config, extraNinjaDeps []string) str if mixedModeBuild { runMixedModeBuild(configuration, ctx, extraNinjaDeps) } 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) if err != nil { 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 // special-cased. // TODO: Fix this by not passing --used_env to the soong_docs invocation - runSoongDocs(configuration, extraNinjaDeps) + runSoongDocs(configuration) return } @@ -387,7 +389,8 @@ func runBp2Build(configuration android.Config, extraNinjaDeps []string) { // Modules parsed from Android.bp files, and the BazelTargetModules mapped // from the regular Modules. 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() { ninjaDeps = append(ninjaDeps, globPath.FileListFile(configuration.BuildDir()))