From db2afca0781494e2d2583c6d83c4bcd198513ebe Mon Sep 17 00:00:00 2001
From: Brad Leege <bleege@gmail.com>
Date: Thu, 24 Sep 2015 10:11:58 -0500
Subject: #2414 - Removing Crashlytics NDK integration as it's preventing
 TestApp from running

---
 android/java/MapboxGLAndroidSDKTestApp/build.gradle              | 9 ---------
 .../src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java  | 3 +--
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'android')

diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
index d61fe2912b..b42f3565d2 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
@@ -90,12 +90,6 @@ android {
     }
 }
 
-crashlytics {
-    enableNdk true
-    androidNdkOut '../MapboxGLAndroidSDK/src/main/obj.target'
-    androidNdkLibsOut '../MapboxGLAndroidSDK/src/main/obj.target'
-}
-
 dependencies {
     compile(project(':MapboxGLAndroidSDK')) {
         transitive = true
@@ -107,9 +101,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;
-    }
 
     // Testing dependencies
     testCompile 'junit:junit:4.12'
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 3f14ab557c..2f9b374e24 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
@@ -25,7 +25,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;
@@ -79,7 +78,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);
-- 
cgit v1.2.1