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

Commit 934977cb authored by Joe Onorato's avatar Joe Onorato Committed by Gerrit Code Review
Browse files

Merge "Move bazel from being a shell function to being a script at build/bazel/bin/bazel"

parents 783ec5c7 ba29f380

android/bazel_handler.go

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ func (r *builtinBazelRunner) createBazelCommand(paths *bazelPaths, runName bazel 
		"HOME=" + paths.homeDir,

		pwdPrefix(),

		"BUILD_DIR=" + absolutePath(paths.soongOutDir),

		// Make OUT_DIR absolute here so tools/bazel.sh uses the correct

		// Make OUT_DIR absolute here so build/bazel/bin/bazel uses the correct

		// OUT_DIR at <root>/out, instead of <root>/out/soong/workspace/out.

		"OUT_DIR=" + absolutePath(paths.outDir()),

		// Disables local host detection of gcc; toolchain information is defined

build_test.bash

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ df -h || true 


echo

echo "Running Bazel smoke test..."

STANDALONE_BAZEL=true "${TOP}/tools/bazel" --batch --max_idle_secs=1 help

STANDALONE_BAZEL=true "${TOP}/build/bazel/bin/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
@@ -34,7 +34,7 @@ SOONG_OUTPUT_DIR="$OUTPUT_DIR/soong" 
BAZEL_OUTPUT_DIR="$OUTPUT_DIR/bazel"



function call_bazel() {

  tools/bazel --output_base="$BAZEL_OUTPUT_DIR" $@

  build/bazel/bin/bazel --output_base="$BAZEL_OUTPUT_DIR" $@

}



function cleanup {

tests/lib.sh

+1 −2
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ function create_mock_bazel { 


  symlink_file WORKSPACE

  symlink_file BUILD

  symlink_file tools/bazel

}



function run_bazel {
@@ -136,7 +135,7 @@ function run_bazel { 
  # output should not be parsed as such.

  rm -rf out/ninja_build



  tools/bazel "$@"

  build/bazel/bin/bazel "$@"

}



function run_ninja {

ui/build/bazel.go

+2 −2
Original line number Diff line number Diff line
@@ -85,9 +85,9 @@ func runBazel(ctx Context, config Config) { 


	bazelEnv["SHELL"] = "/bin/bash"



	// `tools/bazel` is the default entry point for executing Bazel in the AOSP

	// `build/bazel/bin/bazel` is the default entry point for executing Bazel in the AOSP

	// source tree.

	bazelExecutable := filepath.Join("tools", "bazel")

	bazelExecutable := filepath.Join("build", "bazel", "bin", "bazel")

	cmd := Command(ctx, config, "bazel", bazelExecutable)



	// Append custom startup flags to the Bazel command. Startup flags affect