From cdcc30fa4adf7ffb393e3cd885f8c9ed4281fdc8 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sat, 1 Nov 2014 22:57:14 -0400
Subject: [PATCH] fix another path to mason

---
 Makefile                 | 18 +++++++++---------
 scripts/travis_script.sh |  6 ++++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 5ea12ff3d..e611b4072 100644
--- a/Makefile
+++ b/Makefile
@@ -71,15 +71,15 @@ build/linux/mapboxgl-app.xcodeproj: linux/mapboxgl-app.gyp config.gypi
 
 .PHONY: android
 android:
-	export CXX=`MASON_PLATFORM=android ~/.mason/mason env CXX` && \
-	export CC=`MASON_PLATFORM=android ~/.mason/mason env CC` && \
-	export LD=`MASON_PLATFORM=android ~/.mason/mason env LD` && \
-	export AR=`MASON_PLATFORM=android ~/.mason/mason env AR` && \
-	export RANLIB=`MASON_PLATFORM=android ~/.mason/mason env RANLIB` && \
-	export LDFLAGS=`MASON_PLATFORM=android ~/.mason/mason env LDFLAGS` && \
-	export CFLAGS=`MASON_PLATFORM=android ~/.mason/mason env CFLAGS` && \
-	export CPPFLAGS=`MASON_PLATFORM=android ~/.mason/mason env CPPFLAGS` && \
-	export PATH=`MASON_PLATFORM=android ~/.mason/mason env PATH` && \
+	export CXX=`MASON_PLATFORM=android ./.mason/mason env CXX` && \
+	export CC=`MASON_PLATFORM=android ./.mason/mason env CC` && \
+	export LD=`MASON_PLATFORM=android ./.mason/mason env LD` && \
+	export AR=`MASON_PLATFORM=android ./.mason/mason env AR` && \
+	export RANLIB=`MASON_PLATFORM=android ./.mason/mason env RANLIB` && \
+	export LDFLAGS=`MASON_PLATFORM=android ./.mason/mason env LDFLAGS` && \
+	export CFLAGS=`MASON_PLATFORM=android ./.mason/mason env CFLAGS` && \
+	export CPPFLAGS=`MASON_PLATFORM=android ./.mason/mason env CPPFLAGS` && \
+	export PATH=`MASON_PLATFORM=android ./.mason/mason env PATH` && \
 	MASON_PLATFORM=android ./configure config-android.gypi && \
 	deps/run_gyp mapboxgl.gyp -Iconfig-android.gypi -Dplatform=android --depth=. --generator-output=./build/android -f make-android && \
 	$(MAKE) -C ./build/android BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl-core
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index f3da79842..562d6fad2 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}