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 am: d2b52bb4b8

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

Change-Id: I2ce6de8a9ad1f174a2a4b91096707dd8868aef82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aurimas Liutikas
2023-12-20 11:40:05 +00:00
committed by Automerger Merge Worker
parent 4ff9ba96bd d2b52bb4b8
commit 4e7ae873c6
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 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 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 $FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target linux_openjdk21 manifest_${BUILD_NUMBER}.xml staging/manifest.xml
rm -rf staging/linux-x86 rm -rf staging/linux-x86
@@ -32,9 +33,13 @@ rm -rf staging/darwin-x86
mkdir staging/darwin-x86 mkdir staging/darwin-x86
(cd staging/darwin-x86; unzip -q ${DARWIN_ZIP}) (cd staging/darwin-x86; unzip -q ${DARWIN_ZIP})
touch staging/darwin-x86/MODULE_LICENSE_GPL 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 # Copy the RBE toolchain inputs files from the previous version to the staging
# directory. # 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/') 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/* . mv staging/* .
rmdir 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 git commit -m "Update to JDK $version" --edit