| commit | 3ae8302f49390e6c7461afe76c93620eed99c470 | [log] [tgz] |
|---|---|---|
| author | Sorin Basca <sorinbasca@google.com> | Fri Oct 14 09:53:06 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 14 09:53:06 2022 +0000 |
| tree | 28ebf8fc77c2ec8e33c6a4949071e13c1cfba249 | |
| parent | e8c3a314c0cd4244e1d05d4d448b0699765f82ae [diff] | |
| parent | e31bf835903a60236f7250ae48cc9a112d406c03 [diff] |
Add Java 17 as a known version am: e31bf83590 Original change: https://android-review.googlesource.com/c/platform/test/cts-root/+/2254323 Change-Id: Ia2d6cdbae94536c48dd8b3943fcbe800b863d0a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tools/cts-root-tradefed/etc/cts-root-tradefed b/tools/cts-root-tradefed/etc/cts-root-tradefed index 31dde39..5c11f2c 100755 --- a/tools/cts-root-tradefed/etc/cts-root-tradefed +++ b/tools/cts-root-tradefed/etc/cts-root-tradefed
@@ -35,9 +35,9 @@ checkPath java # check java version -JAVA_VERSION=$(java -version 2>&1 | head -n 1 | grep 'version [ "]\(1\.8\|9\|11\).*[ "]') +JAVA_VERSION=$(java -version 2>&1 | head -n 1 | grep 'version [ "]\(1\.8\|9\|11\|17\).*[ "]') if [ "${JAVA_VERSION}" == "" ]; then - echo "Wrong java version. 1.8, 9, or 11 is required." + echo "Wrong java version. 1.8, 9, 11, or 17 is required." exit fi