diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2019-01-17 12:57:53 +0100 |
---|---|---|
committer | tobrun <tobrun.van.nuland@gmail.com> | 2019-01-17 12:57:53 +0100 |
commit | 791c2b926cec15ba484a3c9c13e122bd3ac0baae (patch) | |
tree | 177d4ef11fbeec95aeba799346521ca3ea497e70 | |
parent | c4e4e4d4e4e85eaaf67133f3cf6498199011e0d9 (diff) | |
download | qtlocation-mapboxgl-upstream/tvn-libraryloader.tar.gz |
[android] - make all library loader load the native library only onceupstream/tvn-libraryloader
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java | 12 |
1 files changed, 6 insertions, 6 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 48417047d5..66047ee934 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 @@ -16,16 +16,13 @@ public abstract class LibraryLoader { private static final LibraryLoader DEFAULT = new LibraryLoader() { @Override public void load(String name) { - if (!loaded) { - System.loadLibrary(name); - } - loaded = true; + System.loadLibrary(name); } }; private static volatile LibraryLoader loader = DEFAULT; - protected static boolean loaded; + private static boolean loaded; /** * Set the library loader that loads the shared library. @@ -44,7 +41,10 @@ public abstract class LibraryLoader { */ public static void load() { try { - loader.load("mapbox-gl"); + if (!loaded) { + loader.load("mapbox-gl"); + } + loaded = true; } catch (UnsatisfiedLinkError error) { String message = "Failed to load native shared library."; Logger.e(TAG, message, error); |