commit 8c52358ad7812634c04e12a6a136c1cd275cc68c
author Jingwen Chen <jingwen@google.com> Tue Jun 01 11:19:53 2021 +0000
committer Jingwen Chen <jingwen@google.com> Tue Jun 01 12:07:40 2021 +0000
tree 61f966cf69e23e198bfe1cd66bbcbd175deedfa5
parent 72aedde4831ff5c0c6cd5b1a158131a4402e41f5

Fix OUT_DIR lookup in mixed builds.

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

build_test.bash

diff --git a/build_test.bash b/build_test.bash
index 296a79c..b039285 100755
--- a/build_test.bash
+++ b/build_test.bash
@@ -54,7 +54,7 @@
 
 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..."