diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java index e02f4188f5d..6ad92742b86 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java @@ -16,7 +16,6 @@ import com.facebook.react.bridge.NativeMap; import com.facebook.react.bridge.ReadableNativeMap; import com.facebook.react.bridge.RuntimeExecutor; import com.facebook.react.bridge.RuntimeScheduler; -import com.facebook.react.bridge.queue.MessageQueueThread; import com.facebook.react.fabric.events.EventBeatManager; import com.facebook.react.fabric.events.EventEmitterWrapper; import com.facebook.react.uimanager.PixelUtil; @@ -42,7 +41,6 @@ public class Binding { RuntimeScheduler runtimeScheduler, Object uiManager, EventBeatManager eventBeatManager, - MessageQueueThread jsMessageQueueThread, ComponentFactory componentsRegistry, Object reactNativeConfig); @@ -89,7 +87,6 @@ public class Binding { @Nullable RuntimeScheduler runtimeScheduler, @NonNull FabricUIManager fabricUIManager, @NonNull EventBeatManager eventBeatManager, - @NonNull MessageQueueThread jsMessageQueueThread, @NonNull ComponentFactory componentFactory, @NonNull ReactNativeConfig reactNativeConfig) { fabricUIManager.setBinding(this); @@ -98,7 +95,6 @@ public class Binding { runtimeScheduler, fabricUIManager, eventBeatManager, - jsMessageQueueThread, componentFactory, reactNativeConfig); diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java index c4a6fbfb5c7..811514772d3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java @@ -11,7 +11,6 @@ import androidx.annotation.NonNull; import com.facebook.react.bridge.JSIModuleProvider; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.UIManager; -import com.facebook.react.bridge.queue.MessageQueueThread; import com.facebook.react.common.mapbuffer.ReadableMapBufferSoLoader; import com.facebook.react.config.ReactFeatureFlags; import com.facebook.react.fabric.events.EventBeatManager; @@ -41,24 +40,20 @@ public class FabricJSIModuleProvider implements JSIModuleProvider { Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.get"); final EventBeatManager eventBeatManager = new EventBeatManager(mReactApplicationContext); final FabricUIManager uiManager = createUIManager(eventBeatManager); + Systrace.beginSection( Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.registerBinding"); final Binding binding = new Binding(); + if (ReactFeatureFlags.enableEagerInitializeMapBufferSoFile) { ReadableMapBufferSoLoader.staticInit(); } - MessageQueueThread jsMessageQueueThread = - mReactApplicationContext - .getCatalystInstance() - .getReactQueueConfiguration() - .getJSQueueThread(); binding.register( mReactApplicationContext.getCatalystInstance().getRuntimeExecutor(), mReactApplicationContext.getCatalystInstance().getRuntimeScheduler(), uiManager, eventBeatManager, - jsMessageQueueThread, mComponentFactory, mConfig); diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp index bdabaaf8821..b4d0abd9923 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp @@ -498,7 +498,6 @@ void Binding::installFabricUIManager( jni::alias_ref runtimeSchedulerHolder, jni::alias_ref javaUIManager, EventBeatManager *eventBeatManager, - jni::alias_ref jsMessageQueueThread, ComponentFactory *componentsRegistry, jni::alias_ref reactNativeConfig) { SystraceSection s("FabricUIManagerBinding::installFabricUIManager"); @@ -532,8 +531,6 @@ void Binding::installFabricUIManager( ContextContainer::Shared contextContainer = std::make_shared(); - auto sharedJSMessageQueueThread = - std::make_shared(jsMessageQueueThread); auto runtimeExecutor = runtimeExecutorHolder->cthis()->get(); if (runtimeSchedulerHolder) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h index 717d1be0768..5f261f34534 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h @@ -8,7 +8,6 @@ #pragma once #include -#include #include #include #include @@ -109,7 +108,6 @@ class Binding : public jni::HybridClass, jni::alias_ref runtimeSchedulerHolder, jni::alias_ref javaUIManager, EventBeatManager *eventBeatManager, - jni::alias_ref jsMessageQueueThread, ComponentFactory *componentsRegistry, jni::alias_ref reactNativeConfig);