From 16718b0df77119dd4bbebc383bfbd70afb1c0518 Mon Sep 17 00:00:00 2001
From: tobrun <tobrun.van.nuland@gmail.com>
Date: Thu, 17 Jan 2019 12:35:20 +0100
Subject: [PATCH] [android] - add library loading to peer objects

---
 .../main/java/com/mapbox/mapboxsdk/style/layers/Layer.java  | 5 +++++
 .../java/com/mapbox/mapboxsdk/style/sources/Source.java     | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
index 75388ec32c6..d290c093a7a 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
@@ -5,6 +5,7 @@
 import android.support.annotation.Nullable;
 
 import com.google.gson.JsonElement;
+import com.mapbox.mapboxsdk.LibraryLoader;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.types.Formatted;
 import com.mapbox.mapboxsdk.utils.ThreadUtils;
@@ -20,6 +21,10 @@ public abstract class Layer {
   private boolean invalidated;
   private boolean detached;
 
+  static {
+    LibraryLoader.load();
+  }
+
   @Keep
   protected Layer(long nativePtr) {
     checkThread();
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java
index 6e8c521a789..9667a33e09d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java
@@ -3,6 +3,8 @@
 import android.support.annotation.Keep;
 
 import android.support.annotation.NonNull;
+
+import com.mapbox.mapboxsdk.LibraryLoader;
 import com.mapbox.mapboxsdk.utils.ThreadUtils;
 
 /**
@@ -15,6 +17,10 @@ public abstract class Source {
 
   protected boolean detached;
 
+  static {
+    LibraryLoader.load();
+  }
+
   /**
    * Internal use
    *