From cb93d29aa99f62a55c5036c283bccd9ae8439032 Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Wed, 28 Sep 2022 14:42:28 +0000 Subject: [PATCH] Revert "run bp2build in mixed_mode_test.sh" Revert submission 2221893-silvermont-toolchain Reason for revert: broke aosp_master build at b/249495321 Reverted Changes: If32dbdab5:run bp2build in mixed_mode_test.sh Ia96a2a82c:create cc_register_toolchains function I074915cfa:create cc_register_toolchains function Change-Id: I79717a23ebe2d7fe00b1b288acc96ce147e6ae92 --- tests/apex_comparison_tests.sh | 2 +- tests/mixed_mode_test.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/apex_comparison_tests.sh b/tests/apex_comparison_tests.sh index 61d131b9e..6bc0165b7 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 --config=bp2build output_path)" +BAZEL_OUT="$(call_bazel info 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 f6fffad4b..b408fd325 100755 --- a/tests/mixed_mode_test.sh +++ b/tests/mixed_mode_test.sh @@ -14,9 +14,7 @@ function test_bazel_smoke { setup create_mock_bazel - run_soong bp2build - - run_bazel info --config=bp2build + STANDALONE_BAZEL=true run_bazel info } test_bazel_smoke