From f6a784ce8c5c061e8d306ef19f012032cbad273f Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Wed, 23 Sep 2015 13:21:48 -0500 Subject: Revert "Add Crashlytics NDK to Android" This reverts commit 6e55dd575e481cb2b71e6dceac7739f0935e572b. --- Makefile | 4 ++-- android/java/.gitignore | 6 ------ .../java/MapboxGLAndroidSDKTestApp/build.gradle | 18 ---------------- .../com/mapbox/mapboxgl/testapp/MainActivity.java | 3 +-- android/mapboxgl-app.gypi | 8 +------- scripts/android/run.sh | 24 +++++++++------------- 6 files changed, 14 insertions(+), 49 deletions(-) diff --git a/Makefile b/Makefile index c7099ce03c..c69e426dde 100644 --- a/Makefile +++ b/Makefile @@ -130,8 +130,8 @@ clean: clear_sqlite_cache clear_xcode_cache -rm -rf ./ios/build -rm -rf ./test/build -rm -rf ./config/*.gypi - -rm -rf ./android/java/build ./android/java/MapboxGLAndroidSDK/build ./android/java/MapboxGLAndroidSDKTestApp/build - -rm -rf ./android/java/MapboxGLAndroidSDK/src/main/libs ./android/java/MapboxGLAndroidSDK/src/main/obj.target ./android/java/MapboxGLAndroidSDK/src/main/assets + -rm -rf ./android/java/build ./android/java/MapboxGLAndroidSDKTestApp/build ./android/java/MapboxGLAndroidSDKTestApp/build + -rm -rf ./android/java/MapboxGLAndroidSDK/src/main/jniLibs ./android/java/MapboxGLAndroidSDK/src/main/assets -rm -f ./android/test/features.zip distclean: clean diff --git a/android/java/.gitignore b/android/java/.gitignore index a79fb8fae5..8664418107 100644 --- a/android/java/.gitignore +++ b/android/java/.gitignore @@ -10,12 +10,6 @@ build/ *.so *.apk -# JNI -MapboxGLAndroidSDK/src/main/libs/ -MapboxGLAndroidSDK/src/main/jniLibs/ -MapboxGLAndroidSDK/src/main/obj/ -MapboxGLAndroidSDK/src/main/obj.target/ - # Lib assets MapboxGLAndroidSDK/src/main/assets/ diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle index 02f8a19eb7..172f31d0fc 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle +++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle @@ -76,21 +76,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - - splits { - abi { - enable true - reset() - include 'armeabi', 'armeabi-v7a', 'x86', 'mips' - universalApk true - } - } -} - -crashlytics { - enableNdk true - androidNdkOut '../MapboxGLAndroidSDK/src/main/obj.target' - androidNdkLibsOut '../MapboxGLAndroidSDK/src/main/obj.target' } dependencies { @@ -104,9 +89,6 @@ dependencies { compile('com.crashlytics.sdk.android:crashlytics:2.5.1@aar') { transitive = true; } - compile('com.crashlytics.sdk.android:crashlytics-ndk:1.1.1@aar') { - transitive = true; - } } checkstyle { diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java index 3c486185d0..f81717ae51 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java @@ -24,7 +24,6 @@ import android.view.View; import android.widget.TextView; import android.widget.Toast; import com.crashlytics.android.Crashlytics; -import com.crashlytics.android.ndk.CrashlyticsNdk; import com.mapbox.mapboxgl.annotations.Marker; import com.mapbox.mapboxgl.annotations.MarkerOptions; import com.mapbox.mapboxgl.annotations.PolygonOptions; @@ -78,7 +77,7 @@ public class MainActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Fabric.with(this, new Crashlytics(), new CrashlyticsNdk()); + Fabric.with(this, new Crashlytics()); // Load the layout setContentView(R.layout.activity_main); diff --git a/android/mapboxgl-app.gypi b/android/mapboxgl-app.gypi index 7a8c52d5b6..e32775ff72 100644 --- a/android/mapboxgl-app.gypi +++ b/android/mapboxgl-app.gypi @@ -79,19 +79,13 @@ ], 'destination': '<(pwd)/../android/java/MapboxGLAndroidSDK/src/main/assets' }, - { - 'files': [ - '<(PRODUCT_DIR)/obj.target' - ], - 'destination': '<(pwd)/../android/java/MapboxGLAndroidSDK/src/main' - }, ], 'actions': [ { 'action_name': 'Strip dynamic library', 'inputs': [ '<(PRODUCT_DIR)/lib.target/libmapbox-gl.so' ], - 'outputs': [ '<(pwd)/../android/java/MapboxGLAndroidSDK/src/main/libs/$(JNIDIR)/libmapbox-gl.so' ], + 'outputs': [ '<(pwd)/../android/java/MapboxGLAndroidSDK/src/main/jniLibs/$(JNIDIR)/libmapbox-gl.so' ], 'action': [ '$(STRIP)', '<@(_inputs)', '-o', '<@(_outputs)' ] }, ], 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 -- cgit v1.2.1