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

Commit ab558d92 authored by Sam Delmerico's avatar Sam Delmerico Committed by Gerrit Code Review
Browse files

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

parents b9f74415 73d6bcc7

build_test.bash

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

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

tests/mixed_mode_test.sh

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