diff options
author | Dane Springmeyer <dane@mapbox.com> | 2014-11-01 22:52:33 -0400 |
---|---|---|
committer | Dane Springmeyer <dane@mapbox.com> | 2014-11-01 22:52:33 -0400 |
commit | 969ef9a663b3502c8f6ffb8063d6f52cf19b8f53 (patch) | |
tree | 7f41039f449da91fb6e765b32c511530ea438df1 | |
parent | 766343e304b9dd8e2f27a37d4233d821efe76f23 (diff) | |
download | qtlocation-mapboxgl-969ef9a663b3502c8f6ffb8063d6f52cf19b8f53.tar.gz |
test android target on travis/linux
-rw-r--r-- | .travis.yml | 3 | ||||
-rwxr-xr-x | scripts/travis_script.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index a7c7109f03..905bc4a661 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ matrix: - os: linux include: - os: linux - env: BUILDTYPE=Release JOBS=16 + env: BUILDTYPE=Release JOBS=16 MASON_PLATFORM=android compiler: clang - os: linux env: BUILDTYPE=Debug JOBS=16 @@ -25,6 +25,7 @@ env: - LD_LIBRARY_PATH: '/usr/local/lib' before_install: +- if [ "${MASON_PLATFORM}" = "android" ]; then MASON_PLATFORM= ~/.mason/mason install 7z 9.20; export PATH=$(MASON_PLATFORM= ~/.mason/mason prefix 7z 9.20)/bin:${PATH}; wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin; chmod a+x ./android-ndk-r10c-linux-x86_64.bin; 7za x ./android-ndk-r10c-linux-x86_64.bin > /dev/null; export ANDROID_NDK_PATH=$(pwd)/android-ndk-r10c; ls -l;ls -l $ANDROID_NDK_PATH; fi; - source ./scripts/local_mason.sh - source ./scripts/travis_helper.sh - source ./scripts/flags.sh diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index ea6097dc55..f3da798423 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -11,7 +11,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # build & test Linux # mapbox_time "compile_program" \ - make linux -j$JOBS BUILDTYPE=${BUILDTYPE} + make android -j$JOBS BUILDTYPE=${BUILDTYPE} mapbox_time "compile_tests" \ make test -j$JOBS BUILDTYPE=${BUILDTYPE} |