diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2018-12-06 21:45:12 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2018-12-06 22:35:44 +0530 |
| commit | ad849fb9407f5f2f477c387922ec140a851e92d6 (patch) | |
| tree | f93619471b2d64773d771ca72d1b14948e5d56af | |
| parent | e8c11776f2d3d62752a5f4d994865cf9fc2ae5fd (diff) | |
android: tradefed: fix java installation for Oreo
Change-Id: Ia774de85db768d711256c7ce17dd4da147d67ed5
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rwxr-xr-x | automated/android/noninteractive-tradefed/setup.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/automated/android/noninteractive-tradefed/setup.sh b/automated/android/noninteractive-tradefed/setup.sh index d3f97c8..c4beef8 100755 --- a/automated/android/noninteractive-tradefed/setup.sh +++ b/automated/android/noninteractive-tradefed/setup.sh @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/bash -x # shellcheck disable=SC2154 # shellcheck disable=SC1091 @@ -9,7 +9,7 @@ if [ -z "${ANDROID_VERSION}" ]; then # install jdk8 when nothing specified # to avoid regression JDK="openjdk-8-jdk-headless" -elif [ "X${ANDROID_VERSION}" = "XO" ] ; then +elif [[ "${ANDROID_VERSION}" = *"8.1"* || "${ANDROID_VERSION}" = *"O"* ]] ; then JDK="openjdk-8-jdk-headless" else # Use Jdk9 for all other builds |