[JBR21] Adjust boot JDK location

Change-Id: I30ecb2505819d09452a8b8a0e4d5477506634641
diff --git a/build-jbr_next-linux-x64.sh b/build-jbr_next-linux-x64.sh
index ba18abe..dc846ca 100755
--- a/build-jbr_next-linux-x64.sh
+++ b/build-jbr_next-linux-x64.sh
@@ -14,7 +14,7 @@
 source $(dirname $0)/build-jetbrainsruntime-common.sh
 
 declare -r sources_dir="$top/external/jetbrains/JetBrainsRuntime-next"
-declare -r boot_jdk="$top/prebuilts/jdk/studio/jbrjdk21/linux-x64"
+declare -r boot_jdk="$top/prebuilts/jdk/studio/jbr-next/linux"
 
 echo "Building Linux JDK......."
 echo "out_path=${out_path:-}"
diff --git a/build-jbr_next-mac-aarch64.sh b/build-jbr_next-mac-aarch64.sh
index 56c473e..0d5b0d4 100755
--- a/build-jbr_next-mac-aarch64.sh
+++ b/build-jbr_next-mac-aarch64.sh
@@ -14,7 +14,7 @@
 source $(dirname $0)/build-jetbrainsruntime-common.sh
 
 declare -r sources_dir="${top}/external/jetbrains/JetBrainsRuntime-next"
-declare -r boot_jdk="${top}/prebuilts/jdk/studio/jbrjdk21/mac-x64/Contents/Home"
+declare -r boot_jdk="${top}/prebuilts/jdk/studio/jbr-next/mac/Contents/Home"
 
 echo "Building Mac JDK......."
 echo "out_path=${out_path:-}"
diff --git a/build-jbr_next-mac-x64.sh b/build-jbr_next-mac-x64.sh
index 04d9acd..ff9b440 100755
--- a/build-jbr_next-mac-x64.sh
+++ b/build-jbr_next-mac-x64.sh
@@ -14,7 +14,7 @@
 source $(dirname $0)/build-jetbrainsruntime-common.sh
 
 declare -r sources_dir="${top}/external/jetbrains/JetBrainsRuntime-next"
-declare -r boot_jdk="${top}/prebuilts/jdk/studio/jbrjdk21/mac-x64/Contents/Home"
+declare -r boot_jdk="${top}/prebuilts/jdk/studio/jbr-next/mac/Contents/Home"
 
 echo "Building Mac JDK......."
 echo "out_path=${out_path:-}"
diff --git a/build-jbr_next-win-x64.sh b/build-jbr_next-win-x64.sh
index 0511dab..daadc80 100644
--- a/build-jbr_next-win-x64.sh
+++ b/build-jbr_next-win-x64.sh
@@ -20,7 +20,7 @@
 echo "build_number=${build_number:-}"
 
 declare -r sources_dir="${top}/external/jetbrains/JetBrainsRuntime-next"
-declare -r boot_jdk="$top/prebuilts/jdk/studio/jbrjdk21/windows-x64"
+declare -r boot_jdk="$top/prebuilts/jdk/studio/jbr-next/win"
 
 if [ -f "$dist_dir"/jdk.zip ]; then
   echo "Re-using existing JDK $dist_dir/jdk.zip"