diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricSoLoader.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricSoLoader.java index 26526701c51..44d3c1b99c1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricSoLoader.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricSoLoader.java @@ -14,7 +14,7 @@ import com.facebook.react.bridge.ReactMarkerConstants; import com.facebook.soloader.SoLoader; import com.facebook.systrace.Systrace; -public class FabricSoLoader { +class FabricSoLoader { private static volatile boolean sDidInit = false; public static void staticInit() { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index 0da8e55dd8d..ed3ee2f8171 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -91,6 +91,10 @@ import java.util.concurrent.CopyOnWriteArrayList; @SuppressLint("MissingNativeLoadLibrary") @DoNotStripAny public class FabricUIManager implements UIManager, LifecycleEventListener { + static { + FabricSoLoader.staticInit(); + } + public static final String TAG = FabricUIManager.class.getSimpleName(); // The IS_DEVELOPMENT_ENVIRONMENT variable is used to log extra data when running fabric in a @@ -151,10 +155,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { } }; - static { - FabricSoLoader.staticInit(); - } - @Nullable private Binding mBinding; @NonNull private final ReactApplicationContext mReactApplicationContext; @NonNull private final MountingManager mMountingManager; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java index f67dd871671..d658b1a05a4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java @@ -12,7 +12,6 @@ import androidx.annotation.NonNull; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.fabric.FabricSoLoader; import com.facebook.react.uimanager.events.BatchEventDispatchedListener; /** @@ -21,10 +20,6 @@ import com.facebook.react.uimanager.events.BatchEventDispatchedListener; @SuppressLint("MissingNativeLoadLibrary") public class EventBeatManager implements BatchEventDispatchedListener { - static { - FabricSoLoader.staticInit(); - } - @DoNotStrip private final HybridData mHybridData; private final ReactApplicationContext mReactApplicationContext; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java index 6ff777f1a41..14b06af0b42 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java @@ -14,7 +14,6 @@ import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.NativeMap; import com.facebook.react.bridge.WritableMap; -import com.facebook.react.fabric.FabricSoLoader; import com.facebook.react.uimanager.events.EventCategoryDef; /** @@ -24,10 +23,6 @@ import com.facebook.react.uimanager.events.EventCategoryDef; @SuppressLint("MissingNativeLoadLibrary") public class EventEmitterWrapper { - static { - FabricSoLoader.staticInit(); - } - @DoNotStrip private final HybridData mHybridData; private EventEmitterWrapper(HybridData hybridData) {