From 80016cd4697b46df6a9f40a8cd7b88b27afd318e Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Fri, 12 Dec 2014 09:49:06 +1100
Subject: Don't need X for android builds

---
 scripts/flags.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts/flags.sh')

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
-- 
cgit v1.2.1