From 8b77a009e2a49e453b4fb346c4080ea7b5295d02 Mon Sep 17 00:00:00 2001
From: Chris Parsons <cparsons@google.com>
Date: Tue, 27 Oct 2020 18:59:25 -0400
Subject: [PATCH] Change mixed soong/bazel builds to use USE_BAZEL_ANALYSIS

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
---
 android/bazel_handler.go | 4 +++-
 bazel/bazelenv.sh        | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/android/bazel_handler.go b/android/bazel_handler.go
index 210d67a83..221aabc28 100644
--- a/android/bazel_handler.go
+++ b/android/bazel_handler.go
@@ -119,7 +119,9 @@ func (n noopBazelContext) BazelEnabled() bool {
 }
 
 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
 	}
 
diff --git a/bazel/bazelenv.sh b/bazel/bazelenv.sh
index 2ca8baf98..fcf71f118 100755
--- a/bazel/bazelenv.sh
+++ b/bazel/bazelenv.sh
@@ -59,12 +59,16 @@ if [ -z "$BAZEL_PATH" ] ; then
     export BAZEL_PATH="$(which bazel)"
 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_OUTPUT_BASE="$BASE_DIR/output"
 export BAZEL_WORKSPACE="$(gettop)"
 
-echo "USE_BAZEL=${USE_BAZEL}"
+echo "USE_BAZEL_ANALYSIS=${USE_BAZEL_ANALYSIS}"
 echo "BAZEL_PATH=${BAZEL_PATH}"
 echo "BAZEL_HOME=${BAZEL_HOME}"
 echo "BAZEL_OUTPUT_BASE=${BAZEL_OUTPUT_BASE}"