diff options
| author | Rahul Ravikumar <rahulrav@google.com> | 2022-02-15 02:00:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-15 02:00:34 +0000 |
| commit | 35f5dc943e6e7dc8980ac5e5b30b2f3753a855d3 (patch) | |
| tree | e3215764ca059f9044dd32118ace3210f091007b | |
| parent | 28e94a627fb48be57e1fc399f870fa9b786d7141 (diff) | |
| parent | 1847945d2a0c64ce66a00199b12206893d8c1b33 (diff) | |
| download | jdk11-35f5dc943e6e7dc8980ac5e5b30b2f3753a855d3.tar.gz | |
Update scripts for JDK 11 prebuilts am: f9a19218ca am: 1847945d2a
Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/1985458
Change-Id: I675d99e46ff33c5b3e1c118d56b4fc07586a5669
| -rwxr-xr-x | update.sh | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -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 @@ mkdir -p staging $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 @@ mkdir staging/darwin-x86 (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. |