diff options
| author | Leith Bade <leith@mapbox.com> | 2015-09-18 09:43:15 +1000 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-09-23 11:56:30 +1000 |
| commit | 6e55dd575e481cb2b71e6dceac7739f0935e572b (patch) | |
| tree | 5b4baee1549f4450bc784ed88056baacac865a70 /scripts | |
| parent | d2d3df2a694fd75ce59a2879aa0d4fec2dacff23 (diff) | |
| download | qtlocation-mapboxgl-6e55dd575e481cb2b71e6dceac7739f0935e572b.tar.gz | |
Add Crashlytics NDK to Android
Closes #2107
Conflicts:
Makefile
android/java/MapboxGLAndroidSDKTestApp/build.gradle
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/android/run.sh | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/scripts/android/run.sh b/scripts/android/run.sh index 2ef0c40c99..73ffc4c5ce 100755 --- a/scripts/android/run.sh +++ b/scripts/android/run.sh @@ -39,16 +39,20 @@ if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then S3_PREFIX=s3://mapbox/mapbox-gl-native/android/build/${TRAVIS_JOB_NUMBER} APK_OUTPUTS=./android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk - - # Upload either the debug or the release build - if [ ${BUILDTYPE} == "Debug" ] ; then - aws s3 cp \ - ${APK_OUTPUTS}/MapboxGLAndroidSDKTestApp-debug.apk \ - ${S3_PREFIX}/MapboxGLAndroidSDKTestApp-debug.apk - elif [ ${BUILDTYPE} == "Release" ] ; then - aws s3 cp \ - ${APK_OUTPUTS}/MapboxGLAndroidSDKTestApp-release-unsigned.apk \ - ${S3_PREFIX}/MapboxGLAndroidSDKTestApp-release-unsigned.apk + JNILIB=`mason env JNIDIR` + + # ARM64 does not build APK for now + if [ ${JNIDIR} != "arm64-v8a" ] ; then + # Upload either the debug or the release build + if [ ${BUILDTYPE} == "Debug" ] ; then + aws s3 cp \ + ${APK_OUTPUTS}/MapboxGLAndroidSDKTestApp-${JNILIB}-debug.apk \ + ${S3_PREFIX}/MapboxGLAndroidSDKTestApp-debug.apk + elif [ ${BUILDTYPE} == "Release" ] ; then + aws s3 cp \ + ${APK_OUTPUTS}/MapboxGLAndroidSDKTestApp-${JNILIB}-release-unsigned.apk \ + ${S3_PREFIX}/MapboxGLAndroidSDKTestApp-release-unsigned.apk + fi fi mapbox_time_finish |