diff options
| author | Colin Cross <ccross@android.com> | 2022-04-22 20:46:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-22 20:46:15 +0000 |
| commit | f58455d1979af427252e025c0ea98be4084e867a (patch) | |
| tree | 54150de07e77d7d78ae5c2447c0299b87fd39d33 | |
| parent | c22b17479d016f3c2fd915f0a1df0f1857ed769e (diff) | |
| parent | 31e309fbc63397dcd2ed852d90f4be959befb806 (diff) | |
| download | jdk11-f58455d1979af427252e025c0ea98be4084e867a.tar.gz | |
Get rid of staging commit am: 37644bb977 am: dc2e4915b3 am: 31e309fbc6
Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/2072708
Change-Id: I3b4bd980e0284df32e022959f7b9b6d3616bb47d
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 |