From ead63abadd373433b066f07b8e7f2faf9a101d6b Mon Sep 17 00:00:00 2001
From: Antonio Zugaldia <antonio@mapbox.com>
Date: Mon, 21 Mar 2016 14:33:18 -0400
Subject: [PATCH] [android] Make sure we always load mapbox-gl when a native
 method is loaded Fixes #4175

---
 .../java/com/mapbox/mapboxsdk/offline/OfflineManager.java | 8 ++++++++
 .../java/com/mapbox/mapboxsdk/offline/OfflineRegion.java  | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
index eade67af6..8ddc68c86 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
@@ -16,6 +16,14 @@ public class OfflineManager {
 
     private final static String LOG_TAG = "OfflineManager";
 
+    //
+    // Static methods
+    //
+
+    static {
+        System.loadLibrary("mapbox-gl");
+    }
+
     // Default database name
     private final static String DATABASE_NAME = "mbgl-offline.db";
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
index f47b41e24..7714f9f36 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
@@ -17,6 +17,14 @@ public class OfflineRegion {
 
     private final static String LOG_TAG = "OfflineRegion";
 
+    //
+    // Static methods
+    //
+
+    static {
+        System.loadLibrary("mapbox-gl");
+    }
+
     // Parent OfflineManager
     private OfflineManager offlineManager;