tmakin/android_platform_prebuilts_jdk_jdk21
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the update script to use openjdk builds for darwin

Browse Source 
Test: running the script, following CL
Bug: 302395149
Change-Id: Ia0fb4c66fb9bbff6c7d174714628aa654179c052
This commit is contained in:
Aurimas Liutikas
2023-12-19 09:37:54 -08:00
parent 3df50e0b8e
commit d2b52bb4b8
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
update.sh
+10 -5
View File
@@ -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