StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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
parent 783ec5c72c ba29f380d3
commit 934977cbbe
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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")))