summaryrefslogtreecommitdiff
path: root/scripts/flags.sh
diff options
context:
space:
mode:
authorLeith Bade <leith@mapbox.com>2014-12-12 09:49:06 +1100
committerLeith Bade <leith@mapbox.com>2014-12-12 09:49:06 +1100
commit80016cd4697b46df6a9f40a8cd7b88b27afd318e (patch)
treeab47b495ab5ab99e1d2dc1c6abac039e0009feed /scripts/flags.sh
parent76909d18fb5d06abc078c5988b2175ab8d0bf36c (diff)
downloadqtlocation-mapboxgl-80016cd4697b46df6a9f40a8cd7b88b27afd318e.tar.gz
Don't need X for android builds
Diffstat (limited to 'scripts/flags.sh')
-rwxr-xr-xscripts/flags.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/flags.sh b/scripts/flags.sh
index 0b1f69ae1c..8703677d0a 100755
--- a/scripts/flags.sh
+++ b/scripts/flags.sh
@@ -3,7 +3,9 @@
if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
+ if [[ ${MASON_PLATFORM} != "android" ]]; then
+ sh -e /etc/init.d/xvfb start
+ fi
# use g++ that supports c++11
if [[ ${CXX} == "g++" ]]; then