aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2018-01-11 14:54:07 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2018-01-11 15:10:23 +0530
commit2ad1355bbf7ae77a9ba240f1a57c503e17535aa2 (patch)
tree8cf01358fdf20bfaf7f39d4dddf142a0904706c6
parentd192ef809a1a69278cf6ba68e31f2abdb2c777ec (diff)
tradefed: fix jdk9 installation
ANDROID version is of the format aosp-master-01012018 hence lets look for aosp-master substring. Change-Id: I6c524d898ae9c6f8ab51437272fe6a780f704bfa Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rwxr-xr-xautomated/android/tradefed/tradefed.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/automated/android/tradefed/tradefed.sh b/automated/android/tradefed/tradefed.sh
index 389eebc8..e3d68e86 100755
--- a/automated/android/tradefed/tradefed.sh
+++ b/automated/android/tradefed/tradefed.sh
@@ -48,7 +48,7 @@ wait_boot_completed "${TIMEOUT}"
# sufficient.
# wait_homescreen "${TIMEOUT}"
-if [ "$ANDROID_VERSION" = "AOSP MASTER" ]; then
+if echo "$ANDROID_VERSION" | grep aosp-master ; then
install_deps openjdk-9-jdk-headless
fi