summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2021-12-17 20:41:38 -0800
committerColin Cross <ccross@android.com>2021-12-18 04:44:31 +0000
commita7fdd4a6a1cf137c41b1b4aabd40e6b9772356a2 (patch)
tree940f3dc55e46d4d519c4871987213b7624f8aa35
parent6fdb7a2007a007971ab165502465f9059f7d7c9b (diff)
downloadjdk11-a7fdd4a6a1cf137c41b1b4aabd40e6b9772356a2.tar.gz
Copy remote_toolchain_inputs files when updating JDK
Copy the remote_toolchain_inputs files into the staging directory when updating teh JDK so they are not lost when the staging directory replaces the previous JDK. Test: update.sh 7937646 Change-Id: Idebc436f87e15f0c5b902c63ec24afe7ff6e174b
-rwxr-xr-xupdate.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/update.sh b/update.sh
index 858ff57..14b3397 100755
--- a/update.sh
+++ b/update.sh
@@ -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