From d2b52bb4b8f24b8fae4380af56c2ccfecc40f79a Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Tue, 19 Dec 2023 09:37:54 -0800
Subject: [PATCH] Change the update script to use openjdk builds for darwin

Test: running the script, following CL
Bug: 302395149
Change-Id: Ia0fb4c66fb9bbff6c7d174714628aa654179c052
---
 update.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/update.sh b/update.sh
index 890ba27..be0b50a 100755
--- a/update.sh
+++ b/update.sh
@@ -20,7 +20,8 @@ rm -rf staging
 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 darwin_openjdk21 jdk.zip ${DARWIN_ZIP}
+$FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target darwin_aarch64_openjdk21 jdk.zip ${DARWIN_ARM64_ZIP}
 $FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target linux_openjdk21 manifest_${BUILD_NUMBER}.xml staging/manifest.xml
 
 rm -rf staging/linux-x86
@@ -32,9 +33,13 @@ 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}
+rm -rf staging/darwin-arm64
+mkdir staging/darwin-arm64
+(cd staging/darwin-arm64; unzip -q ${DARWIN_ARM64_ZIP})
+touch staging/darwin-x86/MODULE_LICENSE_GPL
+
+rm -f ${LINUX_ZIP} ${DARWIN_ZIP} ${DARWIN_ARM64_ZIP}
 
 # Copy the RBE toolchain inputs files from the previous version to the staging
 # directory.
@@ -42,8 +47,8 @@ cp linux-x86/bin/*_remote_toolchain_inputs staging/linux-x86/bin
 
 version=$(staging/linux-x86/bin/java -version 2>&1 | grep "OpenJDK Runtime Environment" | sed -e 's/.*(\(.*\))/\1/')
 
-rm -rf linux-x86 darwin-x86 manifest.xml
+rm -rf linux-x86 darwin-x86 darwin-arm64 manifest.xml
 mv staging/* .
 rmdir staging
-git add linux-x86 darwin-x86 manifest.xml
+git add linux-x86 darwin-x86 darwin-arm64 manifest.xml
 git commit -m "Update to JDK $version" --edit