Revert "Add Crashlytics NDK to Android"

This reverts commit 6e55dd575e481cb2b71e6dceac7739f0935e572b.

4 files changed, 2 insertions, 33 deletions

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)' ]
         },
       ],