Update scripts for JDK 11 prebuilts
Change-Id: I94e1b6db1049b96dd4a36ab30002c1b2db3bcd6a
diff --git a/update.sh b/update.sh
index 4414715..72ef070 100755
--- a/update.sh
+++ b/update.sh
@@ -11,7 +11,7 @@
BUILD_NUMBER="${1:?Specify build number}"
LINUX_ZIP=/tmp/$$.linux.zip
DARWIN_ZIP=/tmp/$$.darwin.zip
-DARWIN_AARCH64_ZIP=/tmp/$$.darwin_aarch64.zip
+DARWIN_ARM64_ZIP=/tmp/$$.darwin_arm64.zip
FETCH_ARTIFACT=/google/data/ro/projects/android/fetch_artifact
cd "$(dirname $0)"
@@ -21,7 +21,7 @@
$FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target linux_openjdk11 jdk.zip ${LINUX_ZIP}
$FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target darwin_mac_openjdk11 jdk.zip ${DARWIN_ZIP}
-$FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target darwin_mac_jetbrainsruntime jdk.zip ${DARWIN_AARCH64_ZIP}
+$FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target darwin_aarch64_jetbrainsruntime jdk-bundle.zip ${DARWIN_ARM64_ZIP}
$FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target linux_openjdk11 manifest_${BUILD_NUMBER}.xml staging/manifest.xml
rm -rf staging/linux-x86
@@ -34,12 +34,14 @@
(cd staging/darwin-x86; unzip -q ${DARWIN_ZIP})
touch staging/darwin-x86/MODULE_LICENSE_GPL
-rm -rf staging/darwin-aarch64
-mkdir staging/darwin-aarch64
-(cd staging/darwin-aarch64; unzip -q ${DARWIN_AARCH64_ZIP})
+rm -rf staging/darwin-arm64
+mkdir staging/darwin-arm64
+(cd staging/darwin-arm64; unzip -q ${DARWIN_ARM64_ZIP})
+# Copy contents of the JDK
+(cp -r staging/darwin-arm64/jdk-11.0.13.jdk/Contents/Home/* staging/darwin-arm64; rm -rf staging/darwin-arm64/jdk-11.0.13.jdk)
touch staging/darwin-x86/MODULE_LICENSE_GPL
-rm -f ${LINUX_ZIP} ${DARWIN_ZIP} ${DARWIN_AARCH64_ZIP}
+rm -f ${LINUX_ZIP} ${DARWIN_ZIP} ${DARWIN_ARM64_ZIP}
# Copy the RBE toolchain inputs files from the previous version to the staging
# directory.