summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2022-10-05 09:14:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-05 09:14:06 +0000
commit8ef3194c3e02405c3e22fe596dfd2467e353a436 (patch)
treec3d1764f55cc8773dbe3837e50c1bee80637e453
parent858fc59f20dfa89a78e7e193c8783649f9b306bc (diff)
parent6508592e65ed402bc7260108d6d396923eea649d (diff)
downloadjdk17-8ef3194c3e02405c3e22fe596dfd2467e353a436.tar.gz
Merge "Fix update.sh for darwin-arm64" am: 8903a4e342 am: 9c11b92174 am: ba7d9cd9de am: 53914ce782 am: 6508592e65
Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk17/+/2240477 Change-Id: Ieb6cf826f4df1c792300f14aff22d0ea000d8314 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-xupdate.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/update.sh b/update.sh
index 3967982..53b1761 100755
--- a/update.sh
+++ b/update.sh
@@ -37,7 +37,7 @@ touch staging/darwin-x86/MODULE_LICENSE_GPL
rm -rf staging/darwin-arm64
mkdir staging/darwin-arm64
(cd staging/darwin-arm64; unzip -q ${DARWIN_ARM64_ZIP})
-(cp -r staging/darwin-arm64/jdk-17.0.2.jdk/Contents/Home/* staging/darwin-arm64; rm -rf staging/darwin-arm64/jdk-17.0.2.jdk)
+(cp -r staging/darwin-arm64/Contents/Home/* staging/darwin-arm64; rm -rf staging/darwin-arm64/jdk-17.0.2.jdk)
touch staging/darwin-x86/MODULE_LICENSE_GPL
rm -f ${LINUX_ZIP} ${DARWIN_ZIP} ${DARWIN_ARM64_ZIP}