aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-05 22:44:33 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-05 22:44:33 +0000
commita956b1062416a20c71392e9aa4ad9dc7f8779d5a (patch)
tree6f8f162b1c6f16d01e94b3353340f871c681c771
parentd68b3c3415a808bcf68e4aee33e022c90dc77b04 (diff)
parent0e1e32a0ab4c98f477634fd04d262f75e2822900 (diff)
downloadcsuite-android13-mainline-mediaprovider-release.tar.gz
Snap for 9691662 from 0e1e32a0ab4c98f477634fd04d262f75e2822900 to mainline-mediaprovider-releaseaml_mpr_331918000aml_mpr_331812020aml_mpr_331711020android13-mainline-mediaprovider-release
Change-Id: I56a8c2b2c5d20845fc4677136bbc192d34346670
-rw-r--r--tools/csuite-tradefed/src/scripts/csuite-tradefed4
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