From b6e969077690f475f0760be24e93058516d058de Mon Sep 17 00:00:00 2001 From: Chris Parsons Date: Mon, 31 Oct 2022 20:08:45 -0400 Subject: [PATCH] Add groundwork to easily all-enable bazel-mode This will make it easy to change a "false" boolean to "true" to push `--bazel-mode` by default for all users. Users may disable bazel-by-default with BUILD_BROKEN_DISABLE_BAZEL, and bazel is disabled by default on Darwin hosts (due to lack of test coverage). Bug: 254628592 Bug: 254084584 Test: Presubmits Test: Presubmits for aosp/2263623 Change-Id: Iec712119e06ca8ec93028207d88277f879184cc2 --- tests/bootstrap_test.sh | 1 - tests/bp2build_bazel_test.sh | 4 ---- tests/lib.sh | 2 +- tests/mixed_mode_test.sh | 6 ++---- ui/build/config.go | 18 ++++++++++++++++++ ui/build/config_test.go | 2 ++ 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/tests/bootstrap_test.sh b/tests/bootstrap_test.sh index 2331eb15b..ba5ba8bf9 100755 --- a/tests/bootstrap_test.sh +++ b/tests/bootstrap_test.sh @@ -547,7 +547,6 @@ function test_bp2build_smoke { function test_bp2build_generates_marker_file { setup - create_mock_bazel run_soong bp2build diff --git a/tests/bp2build_bazel_test.sh b/tests/bp2build_bazel_test.sh index ad21d7d89..679ac557c 100755 --- a/tests/bp2build_bazel_test.sh +++ b/tests/bp2build_bazel_test.sh @@ -50,7 +50,6 @@ test_bp2build_null_build_with_globs function test_different_relative_outdir { setup - create_mock_bazel mkdir -p a touch a/g.txt @@ -73,7 +72,6 @@ test_different_relative_outdir function test_different_absolute_outdir { setup - create_mock_bazel mkdir -p a touch a/g.txt @@ -96,7 +94,6 @@ test_different_absolute_outdir function test_bp2build_generates_all_buildfiles { setup - create_mock_bazel mkdir -p foo/convertible_soong_module cat > foo/convertible_soong_module/Android.bp <<'EOF' @@ -167,7 +164,6 @@ eval ${_save_trap} function test_cc_correctness { setup - create_mock_bazel mkdir -p a cat > a/Android.bp <