diff options
| author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2017-12-04 09:55:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-04 09:55:42 +0100 |
| commit | 4f4e5ce16b718df37b095fe8f5d29c657c28ffde (patch) | |
| tree | e667f6842bef16a9af05684c286aa52c98ce1383 /ci/setup_android.sh | |
| parent | 7418d576edb8ee94beb64b22b8d66e0cb66e2d81 (diff) | |
| parent | d0d48666cb1dcfe53a1649e1153bbf884951a9c1 (diff) | |
| download | navit-4f4e5ce16b718df37b095fe8f5d29c657c28ffde.tar.gz | |
Merge branch 'trunk' into icon_crossing
Diffstat (limited to 'ci/setup_android.sh')
| -rw-r--r-- | ci/setup_android.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ci/setup_android.sh b/ci/setup_android.sh index 64e250635..f3ae96900 100644 --- a/ci/setup_android.sh +++ b/ci/setup_android.sh @@ -13,6 +13,14 @@ cd /opt && rm -f android-sdk.tgz export PATH=${PATH}:${ANDROID_SDK_HOME}/tools:${ANDROID_SDK_HOME}/platform-tools:/opt/tools echo y | android update sdk --no-ui --all --filter platform-tools | grep 'package installed' + +# This is only an workaround to make sure the platform tools are installed +if [ ! -d ${ANDROID_SDK_HOME}/platform-tools ] && [ -f ${ANDROID_SDK_HOME}/temp/platform-tools_r26.0.2-linux.zip ]; then + if [ "$(md5sum ${ANDROID_SDK_HOME}/temp/platform-tools_r26.0.2-linux.zip | cut -d" " -f1)" == "ef952bb31497f7535e061ad0e712bed8" ]; then + cd ${ANDROID_SDK_HOME} && unzip ${ANDROID_SDK_HOME}/temp/platform-tools_r26.0.2-linux.zip + fi +fi + #RUN echo y | android update sdk --no-ui --all --filter extra-android-support | grep 'package installed' echo y | android update sdk --no-ui --all --filter android-25 | grep 'package installed' |