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

Change mixed soong/bazel builds to use USE_BAZEL_ANALYSIS

Browse Source 
As a result, one can enable bazel-as-ninja-executor separately from
mixed builds.

Test: Manually verified building image with and without bazelenv.sh.
Change-Id: Ia97806fb41e1de850a80b9483ed8a5ff50d9dab2
This commit is contained in:
Chris Parsons
2020-10-27 18:59:25 -04:00
parent e10dfa4e3d
commit 8b77a009e2
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/bazel_handler.go
View File

@@ -119,7 +119,9 @@ func (n noopBazelContext) BazelEnabled() bool {
} }
func NewBazelContext(c *config) (BazelContext, error) { func NewBazelContext(c *config) (BazelContext, error) {
if c.Getenv("USE_BAZEL") != "1" { // TODO(cparsons): Assess USE_BAZEL=1 instead once "mixed Soong/Bazel builds"
// are production ready.
if c.Getenv("USE_BAZEL_ANALYSIS") != "1" {
return noopBazelContext{}, nil return noopBazelContext{}, nil
} }

8
bazel/bazelenv.sh
View File

@@ -59,12 +59,16 @@ if [ -z "$BAZEL_PATH" ] ; then
export BAZEL_PATH="$(which bazel)" export BAZEL_PATH="$(which bazel)"
fi fi
export USE_BAZEL=1 # TODO(cparsons): Use USE_BAZEL=1 instead once "mixed Soong/Bazel builds" are
# production ready.
export USE_BAZEL_ANALYSIS=1
# TODO(cparsons): Retrieve this information in either envsetup.sh or
# bazel.sh.
export BAZEL_HOME="$BASE_DIR/bazelhome" export BAZEL_HOME="$BASE_DIR/bazelhome"
export BAZEL_OUTPUT_BASE="$BASE_DIR/output" export BAZEL_OUTPUT_BASE="$BASE_DIR/output"
export BAZEL_WORKSPACE="$(gettop)" export BAZEL_WORKSPACE="$(gettop)"
echo "USE_BAZEL=${USE_BAZEL}" echo "USE_BAZEL_ANALYSIS=${USE_BAZEL_ANALYSIS}"
echo "BAZEL_PATH=${BAZEL_PATH}" echo "BAZEL_PATH=${BAZEL_PATH}"
echo "BAZEL_HOME=${BAZEL_HOME}" echo "BAZEL_HOME=${BAZEL_HOME}"
echo "BAZEL_OUTPUT_BASE=${BAZEL_OUTPUT_BASE}" echo "BAZEL_OUTPUT_BASE=${BAZEL_OUTPUT_BASE}"