From e87cdc7fd45704b128c3511a7f8b85ddffac7b12 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@meta.com>
Date: Tue, 18 Oct 2022 13:32:03 -0700
Subject: [PATCH] Move initialization of MapBuffer so

Summary:
This diff refactors the initialization of MapBuffer so

changelog: [internal] internal

Reviewed By: NickGerleman

Differential Revision: D40348981

fbshipit-source-id: 88bbf4f2370373c20f805c3b23d0ecbe8a26bb86
---
 .../src/main/java/com/facebook/react/fabric/Binding.java    | 2 ++
 .../com/facebook/react/fabric/FabricJSIModuleProvider.java  | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

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 182281d168..1565f57e63 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java
@@ -16,6 +16,7 @@ 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.common.mapbuffer.MapBufferSoLoader;
 import com.facebook.react.fabric.events.EventBeatManager;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.uimanager.PixelUtil;
@@ -26,6 +27,7 @@ public class Binding {
 
   static {
     FabricSoLoader.staticInit();
+    MapBufferSoLoader.staticInit();
   }
 
   @DoNotStrip private final HybridData mHybridData;
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 afbc53839c..84690939fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java
@@ -12,8 +12,6 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.JSIModuleProvider;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UIManager;
-import com.facebook.react.common.mapbuffer.MapBufferSoLoader;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.fabric.events.EventBeatManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.systrace.Systrace;
@@ -57,10 +55,6 @@ public class FabricJSIModuleProvider implements JSIModuleProvider<UIManager> {
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.registerBinding");
     final Binding binding = new Binding();
 
-    if (ReactFeatureFlags.mapBufferSerializationEnabled) {
-      MapBufferSoLoader.staticInit();
-    }
-
     binding.register(
         mReactApplicationContext.getCatalystInstance().getRuntimeExecutor(),
         mReactApplicationContext.getCatalystInstance().getRuntimeScheduler(),