Remove bp2build and bazel from soong_ui
Bug: 315353489 Test: m blueprint_tests Change-Id: I9df31b18caaae24e3cf2994e56bb90b50523f11e
This commit is contained in:
@@ -135,22 +135,6 @@ const (
|
||||
RunBuildTests = 1 << iota
|
||||
)
|
||||
|
||||
// checkBazelMode fails the build if there are conflicting arguments for which bazel
|
||||
// build mode to use.
|
||||
func checkBazelMode(ctx Context, config Config) {
|
||||
count := 0
|
||||
if config.bazelProdMode {
|
||||
count++
|
||||
}
|
||||
if config.bazelStagingMode {
|
||||
count++
|
||||
}
|
||||
if count > 1 {
|
||||
ctx.Fatalln("Conflicting bazel mode.\n" +
|
||||
"Do not specify more than one of --bazel-mode and --bazel-mode-staging ")
|
||||
}
|
||||
}
|
||||
|
||||
// checkProblematicFiles fails the build if existing Android.mk or CleanSpec.mk files are found at the root of the tree.
|
||||
func checkProblematicFiles(ctx Context) {
|
||||
files := []string{"Android.mk", "CleanSpec.mk"}
|
||||
@@ -262,8 +246,6 @@ func Build(ctx Context, config Config) {
|
||||
|
||||
defer waitForDist(ctx)
|
||||
|
||||
checkBazelMode(ctx, config)
|
||||
|
||||
// checkProblematicFiles aborts the build if Android.mk or CleanSpec.mk are found at the root of the tree.
|
||||
checkProblematicFiles(ctx)
|
||||
|
||||
|
Reference in New Issue
Block a user