diff options
| author | Colin Cross <ccross@android.com> | 2022-04-22 21:44:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-22 21:44:45 +0000 |
| commit | d504c32f89f750917dafa140c3334236b36ddd09 (patch) | |
| tree | 54150de07e77d7d78ae5c2447c0299b87fd39d33 | |
| parent | ff49024e5d2e96b2e2ddba45359f8cbe830e2abe (diff) | |
| parent | 0a28d0141b74fe179c936f0705c38f1eed4eb22a (diff) | |
| download | jdk11-d504c32f89f750917dafa140c3334236b36ddd09.tar.gz | |
Get rid of staging commit am: 37644bb977 am: dc2e4915b3 am: 31e309fbc6 am: f58455d197 am: 0a28d0141b
Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/2072708
Change-Id: Id31615ebfdf33002d5bd1a864f35113149c7f2b3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | update.sh | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -49,13 +49,8 @@ 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 -git add staging -git commit -m "Add JDK ${version} to staging - -Test: none" - git rm -rf linux-x86 darwin-x86 darwin-arm64 manifest.xml -git mv staging/* . +mv staging/* . rmdir staging -git commit -m "Switch to JDK $version" --edit +git add linux-x86 darwin-x86 darwin-arm64 manifest.xml +git commit -m "Update to JDK $version" --edit |