test android target on travis/linux

This commit is contained in:
Dane Springmeyer
2014-11-01 22:52:33 -04:00
parent 766343e304
commit 969ef9a663
2 changed files with 3 additions and 2 deletions

View File

@@ -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

View File

@@ -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}