diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-12 09:49:06 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-12 09:49:06 +1100 |
| commit | 80016cd4697b46df6a9f40a8cd7b88b27afd318e (patch) | |
| tree | ab47b495ab5ab99e1d2dc1c6abac039e0009feed /.travis.yml | |
| parent | 76909d18fb5d06abc078c5988b2175ab8d0bf36c (diff) | |
| download | qtlocation-mapboxgl-80016cd4697b46df6a9f40a8cd7b88b27afd318e.tar.gz | |
Don't need X for android builds
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 87966b68a5..9cef28fd00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,8 +57,8 @@ before_install: - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export JAVA_HOME="$(pwd)/jdk1.7.0_71"; fi - 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 +- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android"]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi +- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android"]]; then glxinfo; fi install: - make config.gypi |