StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix OUT_DIR lookup in mixed builds.

Browse Source 
In mixed builds, Bazel operates in <root>/out/soong/workspace, but the real
OUT_DIR is just <root>out/, not <root>/out/soong/workspace/out. This CL
ensures that the correct OUT_DIR is passed to mixed builds's bazel by
making OUT_DIR absolute.

Also add STANDALONE_BAZEL to build_test's Bazel smoke test.

Test: TH
Change-Id: If8b4058d43bf821f5196016f9b0ad38edfe18716
This commit is contained in:
Jingwen Chen
2021-06-01 11:19:53 +00:00
parent 72aedde483
commit 8c52358ad7
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_test.bash
View File

@@ -54,7 +54,7 @@ df -h
echo
echo "Running Bazel smoke test..."
"${TOP}/tools/bazel" --batch --max_idle_secs=1 info
STANDALONE_BAZEL=true "${TOP}/tools/bazel" --batch --max_idle_secs=1 info
echo
echo "Running Soong test..."