From fc6dd78935a41106aa6a44058c1abb7d0ba0fa24 Mon Sep 17 00:00:00 2001 From: Felix Oghina Date: Tue, 16 Jan 2018 08:55:05 -0800 Subject: [PATCH] Remove SoLoaderShim, use SoLoader Summary: SoLoader is more stable on older versions of Android. Switching to it should fix recurring issues that we get such as `UnsatisfiedLinkError` and so on. CI + run showcase app. Closes https://github.com/facebook/fresco/pull/1989 Reviewed By: erikandre Differential Revision: D6556420 Pulled By: foghina fbshipit-source-id: ffc3faef6452294b4d781258c64ef57e08d107b5 --- .../facebook/react/modules/fresco/FrescoModule.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java index 936a48a5ef6608..b4e0b997d4480d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java @@ -15,7 +15,6 @@ import android.support.annotation.Nullable; import com.facebook.common.logging.FLog; -import com.facebook.common.soloader.SoLoaderShim; import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory; import com.facebook.imagepipeline.core.ImagePipelineConfig; @@ -100,9 +99,6 @@ public void initialize() { super.initialize(); getReactApplicationContext().addLifecycleEventListener(this); if (!hasBeenInitialized()) { - // Make sure the SoLoaderShim is configured to use our loader for native libraries. - // This code can be removed if using Fresco from Maven rather than from source - SoLoaderShim.setHandler(new FrescoHandler()); if (mConfig == null) { mConfig = getDefaultConfig(getReactApplicationContext()); } @@ -186,11 +182,4 @@ public void onHostDestroy() { Fresco.getImagePipeline().clearMemoryCaches(); } } - - private static class FrescoHandler implements SoLoaderShim.Handler { - @Override - public void loadLibrary(String libraryName) { - SoLoader.loadLibrary(libraryName); - } - } }