From e3c095a3fad172562cfa2bffe9df11834beacd8c Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Mon, 29 Jul 2019 08:20:05 +0300
Subject: [PATCH] travis: specify android version

---
 .travis.yml                    | 2 ++
 scripts/travis_android_deps.sh | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eb25bc9c..93583892 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,6 +71,8 @@ jobs:
       cache: ccache
       os: linux
       dist: xenial
+      language: java # we want xenial, so just java, not android
+      jdk: openjdk8
       before_script:
         - sh scripts/travis_common_deps.sh
         - sh scripts/travis_android_deps.sh
diff --git a/scripts/travis_android_deps.sh b/scripts/travis_android_deps.sh
index 47aac61d..8f9c0777 100755
--- a/scripts/travis_android_deps.sh
+++ b/scripts/travis_android_deps.sh
@@ -11,10 +11,10 @@ wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip -qO sd
 
 echo "Unpack Android SDK"
 unzip sdk.zip > /dev/null 2>/dev/null || exit 1
+cd $TRAVIS_BUILD_DIR
 
 echo "Download all needed tools and NDK"
-cd tools/bin || exit 1
-./sdkmanager --install build-tools\;29.0.1 platform-tools platforms\;android-19 ndk-bundle
+sdk/tools/bin/sdkmanager --install build-tools\;29.0.1 platform-tools platforms\;android-19 ndk-bundle
 
 echo "Download Xash3D FWGS Android source"
 git clone --depth 1 https://github.com/FWGS/xash3d-android-project -b waf android || exit 1