aboutsummaryrefslogtreecommitdiffstats
path: root/src/scripts/ci/travis.yml
diff options
context:
space:
mode:
Diffstat (limited to 'src/scripts/ci/travis.yml')
-rw-r--r--src/scripts/ci/travis.yml16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/scripts/ci/travis.yml b/src/scripts/ci/travis.yml
index f8d640ef3..9a4a4c3c6 100644
--- a/src/scripts/ci/travis.yml
+++ b/src/scripts/ci/travis.yml
@@ -24,8 +24,8 @@ env:
- BUILD_MODE="coverage"
- BUILD_MODE="fuzzers"
- BUILD_MODE="valgrind"
- - ANDROID_ARCH=arm ANDROID_TOOLCHAIN_SUF=eabi BUILD_MODE="docker-android"
- - ANDROID_ARCH=arm64 BUILD_MODE="docker-android"
+ - BUILD_MODE="android-arm7"
+ - BUILD_MODE="android-aarch64"
- BUILD_MODE="cross-i386"
- BUILD_MODE="cross-ppc32"
- BUILD_MODE="cross-ppc64"
@@ -96,10 +96,16 @@ matrix:
env: BUILD_MODE="cross-arm64"
# No docker build on osx
- os: osx
- env: BUILD_MODE="docker-android"
+ env: BUILD_MODE="android-arm7"
+ - os: osx
+ env: BUILD_MODE="android-aarch64"
# Nor for gcc's
- - compiler: gcc
- env: BUILD_MODE="docker-android"
+ - os: linux
+ compiler: gcc
+ env: BUILD_MODE="android-arm7"
+ - os: linux
+ compiler: gcc
+ env: BUILD_MODE="android-aarch64"
install:
- ./src/scripts/ci/setup_travis.sh