summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2015-09-24 10:11:58 -0500
committerBrad Leege <bleege@gmail.com>2015-09-24 10:11:58 -0500
commitdb2afca0781494e2d2583c6d83c4bcd198513ebe (patch)
tree31ed9d4030b4a88161d864a937c6938cc70a42e7 /android
parent85ec3eb0a5739c4f7b160d82715d3be51e10a02b (diff)
downloadqtlocation-mapboxgl-db2afca0781494e2d2583c6d83c4bcd198513ebe.tar.gz
#2414 - Removing Crashlytics NDK integration as it's preventing TestApp from running
Diffstat (limited to 'android')
-rw-r--r--android/java/MapboxGLAndroidSDKTestApp/build.gradle9
-rw-r--r--android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java3
2 files changed, 1 insertions, 11 deletions
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);