StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "run bp2build in mixed_mode_test.sh"

Browse Source 
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
This commit is contained in:
Sam Delmerico
2022-09-28 14:42:28 +00:00
parent 3ff81e784d
commit cb93d29aa9
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/apex_comparison_tests.sh
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 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" export TARGET_PRODUCT="module_arm"
call_bazel build --config=bp2build --config=ci --config=android \ call_bazel build --config=bp2build --config=ci --config=android \

4
tests/mixed_mode_test.sh
View File

@@ -14,9 +14,7 @@ function test_bazel_smoke {
setup setup
create_mock_bazel create_mock_bazel
run_soong bp2build STANDALONE_BAZEL=true run_bazel info
run_bazel info --config=bp2build
} }
test_bazel_smoke test_bazel_smoke