diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-26 11:08:11 +1300 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-26 11:08:11 +1300 |
| commit | 2ad74d5fb0731237ef498e5f74d342e528e2b94f (patch) | |
| tree | 26efbd7ab0fcf44330b4530a5f223a0a53d42260 /.travis.yml | |
| parent | f2af329f2f80666dc9b00132d21c258bbefdd400 (diff) | |
| download | qtlocation-mapboxgl-2ad74d5fb0731237ef498e5f74d342e528e2b94f.tar.gz | |
Move android build to ec2
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 5049a4e32d..a26393969c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ matrix: - os: linux include: - os: linux - env: BUILDTYPE=Release MASON_PLATFORM=android TESTMUNK=yes + env: CONFIG=release MASON_PLATFORM=android TESTMUNK=yes compiler: clang - os: linux - env: BUILDTYPE=Debug MASON_PLATFORM=android TESTMUNK=no + env: CONFIG=debug MASON_PLATFORM=android TESTMUNK=no compiler: clang - os: linux env: BUILDTYPE=Release JOBS=16 @@ -39,10 +39,6 @@ before_install: - source ./scripts/local_mason.sh - source ./scripts/travis_helper.sh - source ./scripts/flags.sh -- export ANDROID_NDK_PATH="$(pwd)/android-ndk-r10c" -- export NDK_HOME="$(pwd)/android-ndk-r10c" -- 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" && ${MASON_PLATFORM} != "android" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi - if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then glxinfo; fi |