Merge "Revert "Revert "run bp2build in mixed_mode_test.sh"""

This commit is contained in:
Sam Delmerico 2022-10-04 13:33:50 +00:00 committed by Gerrit Code Review
commit ab558d92f0
3 changed files with 5 additions and 3 deletions

View file

@ -59,7 +59,7 @@ df -h || true
echo
echo "Running Bazel smoke test..."
STANDALONE_BAZEL=true "${TOP}/tools/bazel" --batch --max_idle_secs=1 info
STANDALONE_BAZEL=true "${TOP}/tools/bazel" --batch --max_idle_secs=1 help
echo
echo "Running Soong test..."

View file

@ -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 \

View file

@ -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