aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-05-26 07:00:13 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-05-26 07:00:13 +0000
commit91f0022d0197040b774a61918a26f168ba088685 (patch)
tree5774ada356749de488aa6456592dfd752bd280bb
parentd81d7347396401a41d8aa7b8651b483f8179681a (diff)
parente6dc73968bb47bdf50d075859f2dca14e9b5f164 (diff)
downloadbazel-busytown-mac-infra-release.tar.gz
Snap for 11878398 from e6dc73968bb47bdf50d075859f2dca14e9b5f164 to busytown-mac-infra-releasebusytown-mac-infra-release
Change-Id: Id2df4917c336f9d50e2b26a35a55c021f4f09c5d
-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"
;;
*)