diff options
| author | Leith Bade <leith@mapbox.com> | 2015-08-07 10:43:00 +1000 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-08-07 10:43:00 +1000 |
| commit | 2d2966b7968fd014634d177ca76df43292cb93f9 (patch) | |
| tree | ebad06389f918db0ee460c2b371da3a343e017e4 /scripts | |
| parent | e2fd96b98a57c82deae38754560b9ae66225731f (diff) | |
| download | qtlocation-mapboxgl-2d2966b7968fd014634d177ca76df43292cb93f9.tar.gz | |
Build correct Android ABIs on Travis
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/android/run.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/scripts/android/run.sh b/scripts/android/run.sh index 38749f79f5..9447bdb7a5 100755 --- a/scripts/android/run.sh +++ b/scripts/android/run.sh @@ -3,12 +3,6 @@ set -e set -o pipefail -BUILDTYPE=${BUILDTYPE:-Release} -TESTMUNK=${TESTMUNK:-no} -export HOST=android -export MASON_PLATFORM=android -export MASON_ANDROID_ABI=${ANDROID_ABI:-arm-v7} - # Add Mason to PATH export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" @@ -23,7 +17,7 @@ mkdir -p ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw echo "${MAPBOX_ACCESS_TOKEN}" > ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt mapbox_time "compile_library" \ -make android-lib -j${JOBS} BUILDTYPE=${BUILDTYPE} +make android-lib-${ANDROID_ABI} -j${JOBS} BUILDTYPE=${BUILDTYPE} mapbox_time "build_apk" \ make android -j${JOBS} BUILDTYPE=${BUILDTYPE} |