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

Remove unused parameter to newContext.

Browse Source 
Test: TH, soong bootstrap tests
Change-Id: Ia7c0fdc2b5d784ef6b389858dab2fcbad35a3763
This commit is contained in:
Jingwen Chen
2021-01-19 04:55:02 -05:00
parent 4d31a041c7
commit 09b609d476
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/soong_build/main.go
View File

@@ -57,7 +57,7 @@ func bazelConversionRequested(configuration android.Config) bool {
return configuration.IsEnvTrue("CONVERT_TO_BAZEL") return configuration.IsEnvTrue("CONVERT_TO_BAZEL")
} }
func newContext(srcDir string, configuration android.Config) *android.Context { func newContext(configuration android.Config) *android.Context {
ctx := android.NewContext(configuration) ctx := android.NewContext(configuration)
if bazelConversionRequested(configuration) { if bazelConversionRequested(configuration) {
// Register an alternate set of singletons and mutators for bazel // Register an alternate set of singletons and mutators for bazel
@@ -106,7 +106,7 @@ func main() {
// needed to correctly evaluate the tree in the second pass. // needed to correctly evaluate the tree in the second pass.
// TODO(cparsons): Don't output any ninja file, as the second pass will overwrite // TODO(cparsons): Don't output any ninja file, as the second pass will overwrite
// the incorrect results from the first pass, and file I/O is expensive. // the incorrect results from the first pass, and file I/O is expensive.
firstCtx := newContext(srcDir, configuration) firstCtx := newContext(configuration)
configuration.SetStopBefore(bootstrap.StopBeforeWriteNinja) configuration.SetStopBefore(bootstrap.StopBeforeWriteNinja)
bootstrap.Main(firstCtx.Context, configuration, extraNinjaDeps...) bootstrap.Main(firstCtx.Context, configuration, extraNinjaDeps...)
// Invoke bazel commands and save results for second pass. // Invoke bazel commands and save results for second pass.
@@ -120,10 +120,10 @@ func main() {
fmt.Fprintf(os.Stderr, "%s", err) fmt.Fprintf(os.Stderr, "%s", err)
os.Exit(1) os.Exit(1)
} }
ctx = newContext(srcDir, secondPassConfig) ctx = newContext(secondPassConfig)
bootstrap.Main(ctx.Context, secondPassConfig, extraNinjaDeps...) bootstrap.Main(ctx.Context, secondPassConfig, extraNinjaDeps...)
} else { } else {
ctx = newContext(srcDir, configuration) ctx = newContext(configuration)
bootstrap.Main(ctx.Context, configuration, extraNinjaDeps...) bootstrap.Main(ctx.Context, configuration, extraNinjaDeps...)
} }