summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
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