tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Joe Onorato 2022-10-25 17:56:58 +00:00 committed by Gerrit Code Review
commit 934977cbbe
6 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/bazel_handler.go
View file

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

2
build_test.bash
View file

@ -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..."

2
tests/apex_comparison_tests.sh
View file

@ -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 {

3
tests/lib.sh
View file

@ -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 {

4
ui/build/bazel.go
View file

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

2
ui/build/soong.go
View file

@ -399,7 +399,7 @@ func runSoong(ctx Context, config Config) {
soongBuildEnv := config.Environment().Copy()
soongBuildEnv.Set("TOP", os.Getenv("TOP"))
// For Bazel mixed builds.
soongBuildEnv.Set("BAZEL_PATH", "./tools/bazel")
soongBuildEnv.Set("BAZEL_PATH", "./build/bazel/bin/bazel")
// Bazel's HOME var is set to an output subdirectory which doesn't exist. This
// prevents Bazel from file I/O in the actual user HOME directory.
soongBuildEnv.Set("BAZEL_HOME", absPath(ctx, filepath.Join(config.BazelOutDir(), "bazelhome")))