Remove bp2build and appurtenances.
Bug: 374816306
Test: treehugger
Change-Id: Ic26f6d6e0772fb07e43d22873519c5afb2ee9a45
diff --git a/ui/build/build.go b/ui/build/build.go
index 28c3284..d5a20b4 100644
--- a/ui/build/build.go
+++ b/ui/build/build.go
@@ -428,7 +428,7 @@
if !config.SoongBuildInvocationNeeded() {
// This means that the output of soong_build is not needed and thus it would
// run unnecessarily. In addition, if this code wasn't there invocations
- // with only special-cased target names like "m bp2build" would result in
+ // with only special-cased target names would result in
// passing Ninja the empty target list and it would then build the default
// targets which is not what the user asked for.
what = what &^ RunNinja
diff --git a/ui/build/config.go b/ui/build/config.go
index 75edfcd..7095f3a 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -68,7 +68,6 @@
type configImpl struct {
// Some targets that are implemented in soong_build
- // (bp2build, json-module-graph) are not here and have their own bits below.
arguments []string
goma bool
environ *Environment
@@ -83,7 +82,6 @@
checkbuild bool
dist bool
jsonModuleGraph bool
- queryview bool
reportMkMetrics bool // Collect and report mk2bp migration progress metrics.
soongDocs bool
skipConfig bool
@@ -983,8 +981,6 @@
c.dist = true
} else if arg == "json-module-graph" {
c.jsonModuleGraph = true
- } else if arg == "queryview" {
- c.queryview = true
} else if arg == "soong_docs" {
c.soongDocs = true
} else {
@@ -1079,7 +1075,7 @@
return true
}
- if !c.JsonModuleGraph() && !c.Queryview() && !c.SoongDocs() {
+ if !c.JsonModuleGraph() && !c.SoongDocs() {
// Command line was empty, the default Ninja target is built
return true
}
@@ -1152,10 +1148,6 @@
return shared.JoinPath(c.SoongOutDir(), "docs/soong_build.html")
}
-func (c *configImpl) QueryviewMarkerFile() string {
- return shared.JoinPath(c.SoongOutDir(), "queryview.marker")
-}
-
func (c *configImpl) ModuleGraphFile() string {
return shared.JoinPath(c.SoongOutDir(), "module-graph.json")
}
@@ -1193,10 +1185,6 @@
return c.jsonModuleGraph
}
-func (c *configImpl) Queryview() bool {
- return c.queryview
-}
-
func (c *configImpl) SoongDocs() bool {
return c.soongDocs
}
@@ -1413,7 +1401,7 @@
func (c *configImpl) UseRBE() bool {
// These alternate modes of running Soong do not use RBE / reclient.
- if c.Queryview() || c.JsonModuleGraph() {
+ if c.JsonModuleGraph() {
return false
}
diff --git a/ui/build/soong.go b/ui/build/soong.go
index f70d9b7..cd20a4a 100644
--- a/ui/build/soong.go
+++ b/ui/build/soong.go
@@ -52,7 +52,6 @@
soongBuildTag = "build"
jsonModuleGraphTag = "modulegraph"
- queryviewTag = "queryview"
soongDocsTag = "soong_docs"
// bootstrapEpoch is used to determine if an incremental build is incompatible with the current
@@ -307,8 +306,6 @@
mainSoongBuildExtraArgs = append(mainSoongBuildExtraArgs, "--incremental-build-actions")
}
- queryviewDir := filepath.Join(config.SoongOutDir(), "queryview")
-
pbfs := []PrimaryBuilderFactory{
{
name: soongBuildTag,
@@ -328,15 +325,6 @@
),
},
{
- name: queryviewTag,
- description: fmt.Sprintf("generating the Soong module graph as a Bazel workspace at %s", queryviewDir),
- config: config,
- output: config.QueryviewMarkerFile(),
- specificArgs: append(baseArgs,
- "--bazel_queryview_dir", queryviewDir,
- ),
- },
- {
name: soongDocsTag,
description: fmt.Sprintf("generating Soong docs at %s", config.SoongDocsHtml()),
config: config,
@@ -572,10 +560,6 @@
checkEnvironmentFile(ctx, soongBuildEnv, config.UsedEnvFile(jsonModuleGraphTag))
}
- if config.Queryview() {
- checkEnvironmentFile(ctx, soongBuildEnv, config.UsedEnvFile(queryviewTag))
- }
-
if config.SoongDocs() {
checkEnvironmentFile(ctx, soongBuildEnv, config.UsedEnvFile(soongDocsTag))
}
@@ -670,10 +654,6 @@
targets = append(targets, config.ModuleGraphFile())
}
- if config.Queryview() {
- targets = append(targets, config.QueryviewMarkerFile())
- }
-
if config.SoongDocs() {
targets = append(targets, config.SoongDocsHtml())
}