diff options
| author | Colin Cross <ccross@android.com> | 2022-04-05 20:44:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-05 20:44:11 +0000 |
| commit | d381ea3ab25d4003667ba70f7e265b87253f87a3 (patch) | |
| tree | 109f38838560e269297e942061e8019db06c352a | |
| parent | 67fd8602c6dc072a4b4531a2c31fac60a0a42bfe (diff) | |
| parent | d5786b23f7f54f7916137b2ebe07cdf1c9862608 (diff) | |
| download | jdk17-d381ea3ab25d4003667ba70f7e265b87253f87a3.tar.gz | |
Add darwin prebuilts to fetch script am: d6c6ab38b7 am: 9011f5c5e2 am: d5786b23f7
Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk17/+/2055428
Change-Id: Iefdb2050b161e68526821be3a4bfa95b3be8bfb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | update.sh | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -10,7 +10,7 @@ BUILD_NUMBER="${1:?Specify build number}" LINUX_ZIP=/tmp/$$.linux.zip -#DARWIN_ZIP=/tmp/$$.darwin.zip +DARWIN_ZIP=/tmp/$$.darwin.zip FETCH_ARTIFACT=/google/data/ro/projects/android/fetch_artifact cd "$(dirname $0)" @@ -19,7 +19,7 @@ rm -rf staging mkdir -p staging $FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target linux_openjdk17 jdk.zip ${LINUX_ZIP} -#$FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target darwin_mac_openjdk17 jdk.zip ${DARWIN_ZIP} +$FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target darwin_mac_openjdk17 jdk.zip ${DARWIN_ZIP} $FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target linux_openjdk17 manifest_${BUILD_NUMBER}.xml staging/manifest.xml rm -rf staging/linux-x86 @@ -27,12 +27,12 @@ mkdir -p staging/linux-x86 (cd staging/linux-x86; unzip -q ${LINUX_ZIP}) touch staging/linux-x86/MODULE_LICENSE_GPL -#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-x86 +mkdir staging/darwin-x86 +(cd staging/darwin-x86; unzip -q ${DARWIN_ZIP}) +touch staging/darwin-x86/MODULE_LICENSE_GPL -rm -f ${LINUX_ZIP} # ${DARWIN_ZIP} +rm -f ${LINUX_ZIP} ${DARWIN_ZIP} # Copy the RBE toolchain inputs files from the previous version to the staging # directory. @@ -46,7 +46,7 @@ git commit -m "Add JDK ${version} to staging Test: none" -git rm -rf linux-x86 manifest.xml # darwin-x86 +git rm -rf linux-x86 darwin-x86 manifest.xml git mv staging/* . rmdir staging git commit -m "Switch to JDK $version" --edit |