diff options
| author | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-09 09:46:29 +1100 |
|---|---|---|
| committer | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-09 09:46:29 +1100 |
| commit | 50431652c84372136517d567141de8165a006e4e (patch) | |
| tree | 6cf8291b585143a237e15cdbc0648d3e7bc5bf83 /.travis.yml | |
| parent | 9f74c79c7dc103e6c718d56dcbb3da5516a67972 (diff) | |
| download | qtlocation-mapboxgl-50431652c84372136517d567141de8165a006e4e.tar.gz | |
More tweaks to osx android on travis
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 5 insertions, 5 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 |