diff options
| author | Brad Leege <bleege@gmail.com> | 2015-09-23 13:21:48 -0500 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2015-09-23 13:21:48 -0500 |
| commit | f6a784ce8c5c061e8d306ef19f012032cbad273f (patch) | |
| tree | 4a3f1302b13485158d8f2e02b930a2518295b4c4 /scripts | |
| parent | 9e96e4e94b5f879b65e64b4baacda4662f8d58ac (diff) | |
| download | qtlocation-mapboxgl-f6a784ce8c5c061e8d306ef19f012032cbad273f.tar.gz | |
Revert "Add Crashlytics NDK to Android"
This reverts commit 6e55dd575e481cb2b71e6dceac7739f0935e572b.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/android/run.sh | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/scripts/android/run.sh b/scripts/android/run.sh index 73ffc4c5ce..2ef0c40c99 100755 --- a/scripts/android/run.sh +++ b/scripts/android/run.sh @@ -39,20 +39,16 @@ 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 - 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 + + # 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 fi mapbox_time_finish |