diff options
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rwxr-xr-x | scripts/travis_before_install.sh | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 935e2c495c..1ecf79fcef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,16 +23,16 @@ matrix: env: BUILDTYPE=Debug JOBS=8 compiler: gcc - os: osx - env: BUILDTYPE=Release JOBS=8 + env: BUILDTYPE=Release JOBS=8 MASON_PLATFORM=android compiler: clang - os: osx - env: BUILDTYPE=Debug JOBS=8 + env: BUILDTYPE=Debug JOBS=8 MASON_PLATFORM=android compiler: clang - os: osx - env: BUILDTYPE=Release JOBS=8 MASON_PLATFORM=android + env: BUILDTYPE=Release JOBS=8 compiler: clang - os: osx - env: BUILDTYPE=Debug JOBS=8 MASON_PLATFORM=android + env: BUILDTYPE=Debug JOBS=8 compiler: clang env: @@ -49,7 +49,7 @@ before_install: - source ./scripts/flags.sh - export ANDROID_NDK_PATH="$(pwd)/android-ndk-r10c" - export NDK_HOME="$(pwd)/android-ndk-r10c" -- export JAVA_HOME="$(pwd)/jdk1.7.0_71" +- 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 diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 7404f5d1fe..a7e778f53d 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -83,7 +83,7 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then echo "debug: unpacking SDK" #mapbox_time "unpacking SDK" \ - unzip android-sdk_r23.0.2-macosx.zip + unzip -qq android-sdk_r23.0.2-macosx.zip mv ./android-sdk-macosx ./android-sdk echo "debug: installing SDK" |