diff options
| author | Sorin Basca <sorinbasca@google.com> | 2023-02-28 22:05:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-28 22:05:33 +0000 |
| commit | 67ac028ef46d445792366db8c9327fd454de8a8f (patch) | |
| tree | 6f8f162b1c6f16d01e94b3353340f871c681c771 | |
| parent | 8fcb3b3c4ede2face5668a4c65279c7c6ac43a67 (diff) | |
| parent | 56cf7d1bb85d1c5b5fdd6c1b4df8f56d5e810f49 (diff) | |
| download | csuite-android13-qpr3-c-s4-release.tar.gz | |
Add Java 17 as a known version am: 68169b5dde am: 56cf7d1bb8android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/test/app_compat/csuite/+/20534168
Change-Id: I5bfcc4fa7a386bef49f2298e34897e1738fb510c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 |