aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Liu <yudiliu@google.com>2024-05-10 18:22:08 +0000
committerYu Liu <yudiliu@google.com>2024-05-10 18:25:10 +0000
commit89cbc89aa58487e514f06a5c8fdaa2d7cb7553d4 (patch)
tree5774ada356749de488aa6456592dfd752bd280bb
parentfb9d46a7f4def991a07d86082e8a45c0c362746d (diff)
downloadbazel-master.tar.gz
Jdk11 was removed, use jdk17 instead.HEADmastermain
Bug: None Test: CI Change-Id: I431c5a556ed07ca5c3a955c6c50ab9329cb65cbd
-rwxr-xr-xbin/bazel4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/bazel b/bin/bazel
index 9121b731..f58bf6ea 100755
--- a/bin/bazel
+++ b/bin/bazel
@@ -29,7 +29,7 @@ case $(uname -s) in
Darwin)
ANDROID_BAZEL_PATH="${TOP}/prebuilts/bazel/darwin-x86_64/bazel"
ANDROID_BAZELRC_NAME="darwin.bazelrc"
- ANDROID_BAZEL_JDK_PATH="${TOP}/prebuilts/jdk/jdk11/darwin-x86"
+ ANDROID_BAZEL_JDK_PATH="${TOP}/prebuilts/jdk/jdk17/darwin-x86"
# Lock down PATH in action execution environment, thereby removing
# Bazel's default /bin, /usr/bin, /usr/local/bin and ensuring
@@ -52,7 +52,7 @@ case $(uname -s) in
ANDROID_BAZEL_PATH="${TOP}/prebuilts/bazel/linux-x86_64/bazel"
ANDROID_BAZELISK_PATH="${TOP}/prebuilts/bazel/linux-x86_64/dev_tools/bazelisk/bazelisk"
ANDROID_BAZELRC_NAME="linux.bazelrc"
- ANDROID_BAZEL_JDK_PATH="${TOP}/prebuilts/jdk/jdk11/linux-x86"
+ ANDROID_BAZEL_JDK_PATH="${TOP}/prebuilts/jdk/jdk17/linux-x86"
RESTRICTED_PATH="${TOP}/prebuilts/build-tools/path/linux-x86:${ABSOLUTE_OUT_DIR}/.path"
;;
*)