diff options
| author | Colin Cross <ccross@android.com> | 2021-12-21 02:04:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-21 02:04:10 +0000 |
| commit | 55b9582ef461d848d30977f53e2abb14934664ac (patch) | |
| tree | 940f3dc55e46d4d519c4871987213b7624f8aa35 | |
| parent | 792ff3d6f7eec3daf7a551bd80c92f885af41dbd (diff) | |
| parent | fc42de64c7178c97c49ee1a09c312a5b2b632e03 (diff) | |
| download | jdk11-55b9582ef461d848d30977f53e2abb14934664ac.tar.gz | |
Merge "Copy remote_toolchain_inputs files when updating JDK" am: 023f88db78 am: fc42de64c7
Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/1928397
Change-Id: I2b44555791f03f603df3f1c04ea37334bb8e8f1c
| -rwxr-xr-x | update.sh | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -34,6 +34,10 @@ touch staging/darwin-x86/MODULE_LICENSE_GPL rm -f ${LINUX_ZIP} ${DARWIN_ZIP} +# Copy the RBE toolchain inputs files from the previous version to the staging +# directory. +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/') # Commit to staging |