diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2019-01-17 18:59:21 +0100 |
|---|---|---|
| committer | tobrun <tobrun.van.nuland@gmail.com> | 2019-01-17 18:59:21 +0100 |
| commit | 646a5f1121e3a00cf0ac942570dfa371a3154590 (patch) | |
| tree | 1844eea52fd5b532e86eb57096a8e926952723e6 | |
| parent | 24468956fc49ba1495e4dba7363a15b6f07f25e7 (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-revert.tar.gz | |
Revert "[android] - add library loading to peer objects"upstream/tvn-revert
This reverts commit 16718b0df77119dd4bbebc383bfbd70afb1c0518.
2 files changed, 0 insertions, 11 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 d290c093a7..75388ec32c 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,7 +5,6 @@ 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; @@ -21,10 +20,6 @@ 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 9667a33e09..6e8c521a78 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,8 +3,6 @@ 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; /** @@ -17,10 +15,6 @@ public abstract class Source { protected boolean detached; - static { - LibraryLoader.load(); - } - /** * Internal use * |