commit d40e74e66b20c22206e560197ee4a85367f082c9
author liuyq <yongqin.liu@linaro.org> Wed Oct 25 00:45:35 2023 +0800
committer GitHub <noreply@github.com> Tue Oct 24 17:45:35 2023 +0100
tree 96946c2c00f6cb96431f4393cc19a415e1ddc090
parent e00572e04b057a13b377608b32a6b3f4d6576297

noninteractive-tradefed: use jdk17 for aosp-main (#470)

which is required by the aosp main build cts/vts now

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

automated/android/noninteractive-tradefed/setup.sh

diff --git a/automated/android/noninteractive-tradefed/setup.sh b/automated/android/noninteractive-tradefed/setup.sh
index de5bbd3..88f6064 100755
--- a/automated/android/noninteractive-tradefed/setup.sh
+++ b/automated/android/noninteractive-tradefed/setup.sh
@@ -6,7 +6,7 @@
 . ../../lib/android-test-lib
 
 java_path="/usr/lib/jvm/java-11-openjdk-amd64/bin/java"
-if [ -n "${ANDROID_VERSION}" ] && echo "${ANDROID_VERSION}" | grep -q  "aosp-android14"; then
+if [ -n "${ANDROID_VERSION}" ] && echo "${ANDROID_VERSION}" | grep -E -q "aosp-android14|aosp-main"; then
     # use openjdk-17 for Android14+ versions
     java_path="/usr/lib/jvm/java-17-openjdk-amd64/bin/java"
 fi