Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb93d29a authored by Sam Delmerico's avatar Sam Delmerico
Browse files

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
parent 3ff81e78

tests/apex_comparison_tests.sh

+1 −1
Original line number Diff line number Diff line
@@ -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 \

tests/mixed_mode_test.sh

+1 −3
Original line number Diff line number Diff line
@@ -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