diff options
| -rw-r--r-- | android/bazel_handler.go | 2 | ||||
| -rwxr-xr-x | build_test.bash | 2 | ||||
| -rwxr-xr-x | tests/apex_comparison_tests.sh | 2 | ||||
| -rw-r--r-- | tests/lib.sh | 3 | ||||
| -rw-r--r-- | ui/build/bazel.go | 4 | ||||
| -rw-r--r-- | ui/build/soong.go | 2 |
6 files changed, 7 insertions, 8 deletions
diff --git a/android/bazel_handler.go b/android/bazel_handler.go index f16ee60ed..e829326ba 100644 --- a/android/bazel_handler.go +++ b/android/bazel_handler.go @@ -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 diff --git a/build_test.bash b/build_test.bash index 92819a1bb..ae53c14e7 100755 --- a/build_test.bash +++ b/build_test.bash @@ -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..." diff --git a/tests/apex_comparison_tests.sh b/tests/apex_comparison_tests.sh index 61d131b9e..5fbbd0f0b 100755 --- a/tests/apex_comparison_tests.sh +++ b/tests/apex_comparison_tests.sh @@ -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 { diff --git a/tests/lib.sh b/tests/lib.sh index 4b4d9085c..7dd2bf385 100644 --- a/tests/lib.sh +++ b/tests/lib.sh @@ -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 { diff --git a/ui/build/bazel.go b/ui/build/bazel.go index 0ebfcd804..bd469a4cd 100644 --- a/ui/build/bazel.go +++ b/ui/build/bazel.go @@ -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 diff --git a/ui/build/soong.go b/ui/build/soong.go index 00e049759..88e55920a 100644 --- a/ui/build/soong.go +++ b/ui/build/soong.go @@ -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"))) |