diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java index de55dc649af8..6e5c142a6aa4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java @@ -50,7 +50,7 @@ @LegacyArchitecture public class CatalystInstanceImpl implements CatalystInstance { static { - BridgeSoLoader.staticInit(); + ReactNativeJNISoLoader.staticInit(); LegacyArchitectureLogger.assertLegacyArchitecture( "CatalystInstanceImpl", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.kt index b0ee31db64c6..1323349edfa6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.kt @@ -50,7 +50,7 @@ protected constructor( private companion object { init { - BridgeSoLoader.staticInit() + ReactNativeJNISoLoader.staticInit() LegacyArchitectureLogger.assertLegacyArchitecture( "CxxModuleWrapperBase", LegacyArchitectureLogLevel.WARNING) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.kt index 2cab88aadc27..ee52dbcfa1c5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.kt @@ -49,7 +49,7 @@ private constructor(@Suppress("NoHungarianNotation") private val mHybridData: Hy public companion object { init { - BridgeSoLoader.staticInit() + ReactNativeJNISoLoader.staticInit() } @JvmStatic diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.kt index f6a491e4aefe..5e7a52c4d177 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.kt @@ -63,7 +63,7 @@ internal class ReactInstanceManagerInspectorTarget(delegate: TargetDelegate) : A init { LegacyArchitectureLogger.assertLegacyArchitecture( "ReactInstanceManagerInspectorTarget", LegacyArchitectureLogLevel.WARNING) - BridgeSoLoader.staticInit() + ReactNativeJNISoLoader.staticInit() } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeSoLoader.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactNativeJNISoLoader.kt similarity index 70% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeSoLoader.kt rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactNativeJNISoLoader.kt index 0625883ff4fc..064e73d38cea 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeSoLoader.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactNativeJNISoLoader.kt @@ -7,15 +7,9 @@ package com.facebook.react.bridge -import com.facebook.react.common.annotations.internal.LegacyArchitecture -import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger import com.facebook.soloader.SoLoader -@LegacyArchitecture -internal object BridgeSoLoader { - init { - LegacyArchitectureLogger.assertLegacyArchitecture("BridgeSoLoader") - } +internal object ReactNativeJNISoLoader { @JvmStatic @Synchronized