commit 090f35f7cfb96f1e6d677a528682e97562deb0c6
author Aurimas Liutikas <aurimas@google.com> Thu Dec 14 16:52:48 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 14 16:52:48 2023 +0000
tree 9593ae8ca6e2342b9c668561c6ba5bb32e53a084
parent bbb32a6ca49e945c6d6cc2ab10a39c3831500efe
parent 5df071e71fb6cbda0ecbf648bfe67d22478cb281

Update the script to fetch darwin x86 from jetbrains target am: 5df071e71f

Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk21/+/2874579

Change-Id: Ib7f3cbc0cee1c8c792172fa89dd745136384eaaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

update.sh

diff --git a/update.sh b/update.sh
index 0271a6e..890ba27 100755
--- a/update.sh
+++ b/update.sh
@@ -10,6 +10,8 @@
 
 BUILD_NUMBER="${1:?Specify build number}"
 LINUX_ZIP=/tmp/$$.linux.zip
+DARWIN_ZIP=/tmp/$$.darwin.zip
+DARWIN_ARM64_ZIP=/tmp/$$.darwin_arm64.zip
 
 FETCH_ARTIFACT=/google/data/ro/projects/android/fetch_artifact
 cd "$(dirname $0)"
@@ -18,6 +20,7 @@
 mkdir -p staging
 
 $FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target linux_openjdk21 jdk.zip ${LINUX_ZIP}
+$FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target darwin_jetbrainsruntime_next jdk.zip ${DARWIN_ZIP}
 $FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target linux_openjdk21 manifest_${BUILD_NUMBER}.xml staging/manifest.xml
 
 rm -rf staging/linux-x86
@@ -25,7 +28,13 @@
 (cd staging/linux-x86; unzip -q ${LINUX_ZIP})
 touch staging/linux-x86/MODULE_LICENSE_GPL
 
-rm -f ${LINUX_ZIP}
+rm -rf staging/darwin-x86
+mkdir staging/darwin-x86
+(cd staging/darwin-x86; unzip -q ${DARWIN_ZIP})
+touch staging/darwin-x86/MODULE_LICENSE_GPL
+rm -rf staging/darwin-arm64
+
+rm -f ${LINUX_ZIP} ${DARWIN_ZIP}
 
 # Copy the RBE toolchain inputs files from the previous version to the staging
 # directory.
@@ -33,8 +42,8 @@
 
 version=$(staging/linux-x86/bin/java -version 2>&1 | grep "OpenJDK Runtime Environment" | sed -e 's/.*(\(.*\))/\1/')
 
-rm -rf linux-x86 manifest.xml
+rm -rf linux-x86 darwin-x86 manifest.xml
 mv staging/* .
 rmdir staging
-git add linux-x86 manifest.xml
+git add linux-x86 darwin-x86 manifest.xml
 git commit -m "Update to JDK $version" --edit