diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2018-12-07 07:07:33 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2018-12-07 09:54:24 +0530 |
| commit | 772db855bf554707ffec6e35684b24b946476589 (patch) | |
| tree | cebc6ce7b892144faec4205f86713d7ad9aa268b | |
| parent | ad849fb9407f5f2f477c387922ec140a851e92d6 (diff) | |
android: tradefed: remove bash extension
Sadly previous patch doesn't work. the variables from
setup.sh like ANDROID_SERIAL is used through out
the job.
Change-Id: I7f8eee80fd9de4dd648a7cd689a616f87845269b
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rwxr-xr-x | automated/android/noninteractive-tradefed/setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/automated/android/noninteractive-tradefed/setup.sh b/automated/android/noninteractive-tradefed/setup.sh index c4beef8..0bc2ba6 100755 --- a/automated/android/noninteractive-tradefed/setup.sh +++ b/automated/android/noninteractive-tradefed/setup.sh @@ -9,7 +9,7 @@ if [ -z "${ANDROID_VERSION}" ]; then # install jdk8 when nothing specified # to avoid regression JDK="openjdk-8-jdk-headless" -elif [[ "${ANDROID_VERSION}" = *"8.1"* || "${ANDROID_VERSION}" = *"O"* ]] ; then +elif echo "${ANDROID_VERSION}" | grep -qe "8.1\|O" ; then JDK="openjdk-8-jdk-headless" else # Use Jdk9 for all other builds |