1 files changed, 5 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java
index 66047ee934..ee9f4b3b65 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java
@@ -13,12 +13,9 @@ public abstract class LibraryLoader {
 
   private static final String TAG = "Mbgl-LibraryLoader";
 
-  private static final LibraryLoader DEFAULT = new LibraryLoader() {
-    @Override
-    public void load(String name) {
-      System.loadLibrary(name);
-    }
-  };
+  private static final LibraryLoader DEFAULT = Mapbox.getModuleProvider()
+    .createLibraryLoaderProvider()
+    .getDefaultLibraryLoader();
 
   private static volatile LibraryLoader loader = DEFAULT;
 
@@ -42,10 +39,11 @@ public abstract class LibraryLoader {
   public static void load() {
     try {
       if (!loaded) {
+        loaded = true;
         loader.load("mapbox-gl");
       }
-      loaded = true;
     } catch (UnsatisfiedLinkError error) {
+      loaded = false;
       String message = "Failed to load native shared library.";
       Logger.e(TAG, message, error);
       MapStrictMode.strictModeViolation(message, error);