summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorLeith Bade <leith@leithalweapon.geek.nz>2014-11-09 09:37:04 +1100
committerLeith Bade <leith@leithalweapon.geek.nz>2014-11-09 09:37:04 +1100
commit9f74c79c7dc103e6c718d56dcbb3da5516a67972 (patch)
tree7ae0234aec3784aaccb32ed4c64925495e4f62ba /.travis.yml
parent59d8cb279149b4bd4c7f3a441ffa00ab3fbdbf3b (diff)
downloadqtlocation-mapboxgl-9f74c79c7dc103e6c718d56dcbb3da5516a67972.tar.gz
First attempt at osx android in travis
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 2b7f6ba5fd..935e2c495c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,7 @@ before_install:
- export ANDROID_NDK_PATH="$(pwd)/android-ndk-r10c"
- export NDK_HOME="$(pwd)/android-ndk-r10c"
- export JAVA_HOME="$(pwd)/jdk1.7.0_71"
-- export ANDROID_HOME="$(pwd)/android-sdk-linux"
+- export ANDROID_HOME="$(pwd)/android-sdk"
- ./scripts/travis_before_install.sh
- if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi
- if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi