commit 0a28d0141b74fe179c936f0705c38f1eed4eb22a
author Colin Cross <ccross@android.com> Fri Apr 22 21:09:37 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 22 21:09:37 2022 +0000
tree 54150de07e77d7d78ae5c2447c0299b87fd39d33
parent 75cc55f4d91ae63991ace33661e265a273f248a7
parent f58455d1979af427252e025c0ea98be4084e867a

Get rid of staging commit am: 37644bb977 am: dc2e4915b3 am: 31e309fbc6 am: f58455d197

Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/2072708

Change-Id: Ia81d7d15baa5039dce39eeb428ee07580eb5294d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

update.sh

diff --git a/update.sh b/update.sh
index 605c54e..74eef70 100755
--- a/update.sh
+++ b/update.sh
@@ -49,13 +49,8 @@
 
 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