diff options
| author | Leith Bade <leith@mapbox.com> | 2015-01-28 21:44:31 +1300 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-01-29 00:52:37 +1300 |
| commit | 61113bf343d31f09f0165dd11b9b9fb0e5fa6adb (patch) | |
| tree | edd5c34aa20f6eaa939abd16682fab5fdfe5e6d5 /android/scripts | |
| parent | 793985580d202de8613a09bfe176b102eff04cdc (diff) | |
| download | qtlocation-mapboxgl-61113bf343d31f09f0165dd11b9b9fb0e5fa6adb.tar.gz | |
Update android ABIs
Diffstat (limited to 'android/scripts')
| -rwxr-xr-x | android/scripts/build-release.sh | 1 | ||||
| -rwxr-xr-x | android/scripts/copy-files.sh | 10 | ||||
| -rwxr-xr-x | android/scripts/run-build.sh | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/android/scripts/build-release.sh b/android/scripts/build-release.sh index c5fb9c19b0..73c7fab81a 100755 --- a/android/scripts/build-release.sh +++ b/android/scripts/build-release.sh @@ -4,6 +4,5 @@ set -e set -o pipefail export BUILDTYPE=Release -export TESTMUNK=yes ./android/scripts/common.sh $1 diff --git a/android/scripts/copy-files.sh b/android/scripts/copy-files.sh new file mode 100755 index 0000000000..e7bfcb2f16 --- /dev/null +++ b/android/scripts/copy-files.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +mkdir -p android/java/lib/src/main/jniLibs/${JNIDIR} +cp build/android/out/${BUILDTYPE}/lib.target/libmapbox-gl.so android/java/lib/src/main/jniLibs/${JNIDIR}/libmapbox-gl.so +mkdir -p android/java/lib/src/main/assets +cp build/android/out/${BUILDTYPE}/ca-bundle.crt android/java/lib/src/main/assets/ca-bundle.crt +cp -r build/android/out/${BUILDTYPE}/styles android/java/lib/src/main/assets/styles diff --git a/android/scripts/run-build.sh b/android/scripts/run-build.sh index b90bb82602..1049c82c14 100755 --- a/android/scripts/run-build.sh +++ b/android/scripts/run-build.sh @@ -32,6 +32,8 @@ user_data="#!/bin/bash export PATH=\$PATH:/android/jdk1.7.0_71/bin export MAPBOX_ACCESS_TOKEN=$MAPBOX_ACCESS_TOKEN export TESTMUNK_KEY=$TESTMUNK_KEY + export TESTMUNK=$TESTMUNK + export MASON_ANDROID_ABI=$MASON_ANDROID_ABI if ./android/scripts/build-$CONFIG.sh $NAME &>../build.log; then echo 'ANDROID BUILD PASSED' |