diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java index 4f187da3557..9af8f0b54b1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java +++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java @@ -47,9 +47,6 @@ public class ReactFeatureFlags { /** Feature flag to configure eager initialization of Fabric */ public static boolean eagerInitializeFabric = false; - /** Feature flag to configure eager initialization classes of Fabric */ - public static boolean eagerInitializeFabricClasses = false; - /** Enables Static ViewConfig in RN Android native code. */ public static boolean enableExperimentalStaticViewConfigs = false; 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 65487b6e053..8308b7be61d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java @@ -15,27 +15,11 @@ 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.ReadableMapBuffer; import com.facebook.react.common.mapbuffer.ReadableMapBufferSoLoader; import com.facebook.react.config.ReactFeatureFlags; import com.facebook.react.fabric.events.EventBeatManager; -import com.facebook.react.fabric.events.EventEmitterWrapper; -import com.facebook.react.fabric.events.FabricEventEmitter; -import com.facebook.react.fabric.mounting.LayoutMetricsConversions; -import com.facebook.react.fabric.mounting.MountItemDispatcher; -import com.facebook.react.fabric.mounting.MountingManager; -import com.facebook.react.fabric.mounting.SurfaceMountingManager; -import com.facebook.react.fabric.mounting.mountitems.DispatchCommandMountItem; -import com.facebook.react.fabric.mounting.mountitems.DispatchIntCommandMountItem; -import com.facebook.react.fabric.mounting.mountitems.DispatchStringCommandMountItem; -import com.facebook.react.fabric.mounting.mountitems.IntBufferBatchMountItem; -import com.facebook.react.fabric.mounting.mountitems.MountItem; -import com.facebook.react.fabric.mounting.mountitems.PreAllocateViewMountItem; -import com.facebook.react.fabric.mounting.mountitems.SendAccessibilityEvent; -import com.facebook.react.uimanager.StateWrapper; import com.facebook.react.uimanager.UIManagerModule; import com.facebook.react.uimanager.ViewManagerRegistry; -import com.facebook.react.uimanager.events.BatchEventDispatchedListener; import com.facebook.react.uimanager.events.EventDispatcher; import com.facebook.systrace.Systrace; @@ -65,10 +49,6 @@ public class FabricJSIModuleProvider implements JSIModuleProvider { Systrace.beginSection( Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.registerBinding"); final Binding binding = new Binding(); - // TODO T31905686: remove this call - if (ReactFeatureFlags.eagerInitializeFabricClasses) { - loadClasses(); - } if (ReactFeatureFlags.enableEagerInitializeMapBufferSoFile) { ReadableMapBufferSoLoader.staticInit(); } @@ -112,37 +92,4 @@ public class FabricJSIModuleProvider implements JSIModuleProvider { Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE); return fabricUIManager; } - - // TODO T31905686: eager load Fabric classes, this is temporary and it will be removed - // in the near future - private static void loadClasses() { - EventBeatManager.class.getClass(); - EventEmitterWrapper.class.getClass(); - FabricEventEmitter.class.getClass(); - DispatchCommandMountItem.class.getClass(); - DispatchIntCommandMountItem.class.getClass(); - DispatchStringCommandMountItem.class.getClass(); - IntBufferBatchMountItem.class.getClass(); - MountItem.class.getClass(); - PreAllocateViewMountItem.class.getClass(); - SendAccessibilityEvent.class.getClass(); - LayoutMetricsConversions.class.getClass(); - MountingManager.class.getClass(); - MountItemDispatcher.class.getClass(); - SurfaceMountingManager.class.getClass(); - Binding.class.getClass(); - ComponentFactory.class.getClass(); - CoreComponentsRegistry.class.getClass(); - FabricComponents.class.getClass(); - FabricSoLoader.class.getClass(); - FabricUIManager.class.getClass(); - GuardedFrameCallback.class.getClass(); - StateWrapper.class.getClass(); - StateWrapperImpl.class.getClass(); - SurfaceHandler.class.getClass(); - SurfaceHandlerBinding.class.getClass(); - BatchEventDispatchedListener.class.getClass(); - ReactNativeConfig.class.getClass(); - ReadableMapBuffer.class.getClass(); - } }