diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | android/scripts/common.sh | 10 | ||||
| -rw-r--r-- | android/scripts/debug.sh | 8 | ||||
| -rw-r--r-- | android/scripts/release.sh | 8 | ||||
| -rwxr-xr-x | scripts/travis_script.sh | 2 |
5 files changed, 29 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index a1fee8fbc7..5049a4e32d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ matrix: - os: linux include: - os: linux - env: BUILDTYPE=Release JOBS=16 MASON_PLATFORM=android TESTMUNK=yes + env: BUILDTYPE=Release MASON_PLATFORM=android TESTMUNK=yes compiler: clang - os: linux - env: BUILDTYPE=Debug JOBS=16 MASON_PLATFORM=android TESTMUNK=no + env: BUILDTYPE=Debug MASON_PLATFORM=android TESTMUNK=no compiler: clang - os: linux env: BUILDTYPE=Release JOBS=16 diff --git a/android/scripts/common.sh b/android/scripts/common.sh new file mode 100644 index 0000000000..a8dffc6155 --- /dev/null +++ b/android/scripts/common.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +NAME=$1 + +export MASON_PLATFORM=android + +make android -j$JOBS BUILDTYPE=${BUILDTYPE} diff --git a/android/scripts/debug.sh b/android/scripts/debug.sh new file mode 100644 index 0000000000..812ec96008 --- /dev/null +++ b/android/scripts/debug.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +export BUILDTYPE=Debug TESTMUNK=no + +./common.sh $1 diff --git a/android/scripts/release.sh b/android/scripts/release.sh new file mode 100644 index 0000000000..e845248a4b --- /dev/null +++ b/android/scripts/release.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +export BUILDTYPE=Release TESTMUNK=yes + +./common.sh $1 diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index 6fc9edd92b..6a69918552 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -8,7 +8,7 @@ git submodule update --init styles if [[ $MASON_PLATFORM == "android" ]]; then mapbox_time "compile_program" \ - make android -j$JOBS BUILDTYPE=${BUILDTYPE} + make android BUILDTYPE=${BUILDTYPE} if [[ $TESTMUNK == "yes" ]]; then mapbox_time_start "upload_testmunk" |