summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2019-01-17 15:45:23 +0100
committerŁukasz Paczos <lukas.paczos@gmail.com>2019-01-17 15:45:23 +0100
commitef699f285d94e0a4e946e403208f33f24780e583 (patch)
tree12469fab51da56e3f42b8d8f89b20557147a2340
parente488784f00ee3e5d787bb1a95dd90a0c58d58761 (diff)
downloadqtlocation-mapboxgl-upstream/lp-libray-loader-ci-failure-test-1.tar.gz
[android] updated licenses after Android vendorizationupstream/lp-libray-loader-ci-failure-test-1
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java12
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 66047ee934..48417047d5 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,13 +16,16 @@ public abstract class LibraryLoader {
private static final LibraryLoader DEFAULT = new LibraryLoader() {
@Override
public void load(String name) {
- System.loadLibrary(name);
+ if (!loaded) {
+ System.loadLibrary(name);
+ }
+ loaded = true;
}
};
private static volatile LibraryLoader loader = DEFAULT;
- private static boolean loaded;
+ protected static boolean loaded;
/**
* Set the library loader that loads the shared library.
@@ -41,10 +44,7 @@ public abstract class LibraryLoader {
*/
public static void load() {
try {
- if (!loaded) {
- loader.load("mapbox-gl");
- }
- loaded = true;
+ loader.load("mapbox-gl");
} catch (UnsatisfiedLinkError error) {
String message = "Failed to load native shared library.";
Logger.e(TAG, message, error);