diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2019-01-17 12:35:20 +0100 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2019-01-21 10:06:58 +0100 |
| commit | 3691a2b25e79c0ffc81d60907709339c4c8e2703 (patch) | |
| tree | 1f5c337e01c237d4a5fe2fbff7c0d9c2b14c8cba | |
| parent | b83030aa9bb1a8d9f14ae8160698c1ee4d5a4c72 (diff) | |
| download | qtlocation-mapboxgl-3691a2b25e79c0ffc81d60907709339c4c8e2703.tar.gz | |
[android] - add library loading to peer objects
2 files changed, 11 insertions, 0 deletions
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 75388ec32c..d290c093a7 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.NonNull; 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 6e8c521a78..9667a33e09 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 @@ package com.mapbox.mapboxsdk.style.sources; 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 * |