From 3ff81e784d0fd92d208442450cac6e4987677421 Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Tue, 20 Sep 2022 15:31:37 -0400 Subject: [PATCH] run bp2build in mixed_mode_test.sh Now that cc_toolchains that are registered in the WORKSPACE file depend on soong_injection, we need to run bp2build before running bazel. Change-Id: If32dbdab5700b9dd142aa6f38250b3b3f0e7530b --- tests/apex_comparison_tests.sh | 2 +- tests/mixed_mode_test.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/apex_comparison_tests.sh b/tests/apex_comparison_tests.sh index 6bc0165b7..61d131b9e 100755 --- a/tests/apex_comparison_tests.sh +++ b/tests/apex_comparison_tests.sh @@ -58,7 +58,7 @@ packages/modules/common/build/build_unbundled_mainline_module.sh \ ###################### build/soong/soong_ui.bash --make-mode BP2BUILD_VERBOSE=1 --skip-soong-tests bp2build -BAZEL_OUT="$(call_bazel info output_path)" +BAZEL_OUT="$(call_bazel info --config=bp2build output_path)" export TARGET_PRODUCT="module_arm" call_bazel build --config=bp2build --config=ci --config=android \ diff --git a/tests/mixed_mode_test.sh b/tests/mixed_mode_test.sh index b408fd325..f6fffad4b 100755 --- a/tests/mixed_mode_test.sh +++ b/tests/mixed_mode_test.sh @@ -14,7 +14,9 @@ function test_bazel_smoke { setup create_mock_bazel - STANDALONE_BAZEL=true run_bazel info + run_soong bp2build + + run_bazel info --config=bp2build } test_bazel_smoke