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
This commit is contained in:
parent
62b471ae71
commit
3ff81e784d
2 changed files with 4 additions and 2 deletions
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue