summaryrefslogtreecommitdiff
path: root/scripts/travis_script.sh
diff options
context:
space:
mode:
authorDane Springmeyer <dane@mapbox.com>2014-11-01 22:57:14 -0400
committerDane Springmeyer <dane@mapbox.com>2014-11-01 22:57:14 -0400
commitcdcc30fa4adf7ffb393e3cd885f8c9ed4281fdc8 (patch)
treedf25bd97dd8fd0a37d5ce686fd69cf3ffec16479 /scripts/travis_script.sh
parentfbd71f69291383452ce667b15314ac913eb9150b (diff)
downloadqtlocation-mapboxgl-cdcc30fa4adf7ffb393e3cd885f8c9ed4281fdc8.tar.gz
fix another path to mason
Diffstat (limited to 'scripts/travis_script.sh')
-rwxr-xr-xscripts/travis_script.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index f3da798423..562d6fad20 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -10,8 +10,10 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
#
# build & test Linux
#
- mapbox_time "compile_program" \
- make android -j$JOBS BUILDTYPE=${BUILDTYPE}
+ if [[ $MASON_PLATFORM == "android" ]]; then
+ mapbox_time "compile_program" \
+ make android -j$JOBS BUILDTYPE=${BUILDTYPE}
+ fi
mapbox_time "compile_tests" \
make test -j$JOBS BUILDTYPE=${BUILDTYPE}