Add Crashlytics NDK to Android

Closes #2107

Conflicts:
	Makefile
	android/java/MapboxGLAndroidSDKTestApp/build.gradle

4 files changed, 33 insertions, 2 deletions

diff --git a/android/java/.gitignore b/android/java/.gitignore
index 8664418107..a79fb8fae5 100644
--- a/android/java/.gitignore
+++ b/android/java/.gitignore
@@ -10,6 +10,12 @@ 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 172f31d0fc..02f8a19eb7 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
@@ -76,6 +76,21 @@ 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 {
@@ -89,6 +104,9 @@ 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 f81717ae51..3c486185d0 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,6 +24,7 @@ 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;
@@ -77,7 +78,7 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Fabric.with(this, new Crashlytics());
+        Fabric.with(this, new Crashlytics(), new CrashlyticsNdk());
 
         // Load the layout
         setContentView(R.layout.activity_main);
diff --git a/android/mapboxgl-app.gypi b/android/mapboxgl-app.gypi
index e3db1269d6..5731d21f85 100644
--- a/android/mapboxgl-app.gypi
+++ b/android/mapboxgl-app.gypi
@@ -74,13 +74,19 @@
           ],
           '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/jniLibs/$(JNIDIR)/libmapbox-gl.so' ],
+          'outputs': [ '<(pwd)/../android/java/MapboxGLAndroidSDK/src/main/libs/$(JNIDIR)/libmapbox-gl.so' ],
           'action': [ '$(STRIP)', '<@(_inputs)', '-o', '<@(_outputs)' ]
         },
       ],