diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-01 09:04:57 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-01 09:04:57 +0000 |
commit | b82d90c33a609e190d95e4b0d528e711a95a2cb9 (patch) | |
tree | 6f8f162b1c6f16d01e94b3353340f871c681c771 | |
parent | bc25806f8be30bbc5d8f8cb1eca3e362a5c7088c (diff) | |
parent | 0e1e32a0ab4c98f477634fd04d262f75e2822900 (diff) | |
download | csuite-b82d90c33a609e190d95e4b0d528e711a95a2cb9.tar.gz |
Snap for 9669149 from 0e1e32a0ab4c98f477634fd04d262f75e2822900 to mainline-resolv-releaseaml_res_331820000android13-mainline-resolv-release
Change-Id: I309ed4c72e659e1f6e7c843a338ca00dc9a54438
-rw-r--r-- | tools/csuite-tradefed/src/scripts/csuite-tradefed | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/csuite-tradefed/src/scripts/csuite-tradefed b/tools/csuite-tradefed/src/scripts/csuite-tradefed index f3b887a..1de0f6b 100644 --- a/tools/csuite-tradefed/src/scripts/csuite-tradefed +++ b/tools/csuite-tradefed/src/scripts/csuite-tradefed @@ -35,9 +35,9 @@ checkPath adb checkPath java # Check the 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 |