From a2d2696e433154b030b4f5206e86d899d12a19cd Mon Sep 17 00:00:00 2001
From: generatedunixname89002005232357 <generatedunixname89002005232357@fb.com>
Date: Fri, 31 Mar 2023 22:18:07 -0700
Subject: [PATCH] Revert D44153451: Multisect successfully blamed D44153451 for
 test or build failures (#36756)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/36756

This diff is reverting D44153451
Depends on D44602279
D44153451: [Fabric][Android] Reduce visibility of FabricSoLoader by mdvacca has been identified to be causing the following test or build failures:

Tests affected:
- [xplat/endtoend/jest-e2e/apps/fb4a/__tests__/consumerwifi/venice/fb4aVeniceAddressSearch-e2e.js](https://www.internalfb.com/intern/test/281475007251570/)

Here's the Multisect link:
https://www.internalfb.com/multisect/1799601
Here are the tasks that are relevant to this breakage:

We're generating a revert to back out the changes in this diff, please note the backout may land if someone accepts it.

Reviewed By: mdvacca

Differential Revision: D44602284

fbshipit-source-id: 50b3b0f131c6c8c1eec3c23156b33559ffc3931e
---
 .../java/com/facebook/react/fabric/FabricSoLoader.java    | 2 +-
 .../java/com/facebook/react/fabric/FabricUIManager.java   | 8 ++++----
 .../facebook/react/fabric/events/EventBeatManager.java    | 5 +++++
 .../facebook/react/fabric/events/EventEmitterWrapper.java | 5 +++++
 4 files changed, 15 insertions(+), 5 deletions(-)

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 44d3c1b99c1f47..26526701c51ef4 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.soloader.SoLoader;
 import com.facebook.systrace.Systrace;
 
-class FabricSoLoader {
+public 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 ed3ee2f8171e70..0da8e55dd8d938 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,10 +91,6 @@
 @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
@@ -155,6 +151,10 @@ public void onFabricCommitEnd(DevToolsReactPerfLogger.FabricCommitPoint commitPo
         }
       };
 
+  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 d658b1a05a425c..f67dd8716715cb 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,6 +12,7 @@
 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;
 
 /**
@@ -20,6 +21,10 @@
 @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 14b06af0b42ea9..6ff777f1a4132b 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,6 +14,7 @@
 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;
 
 /**
@@ -23,6 +24,10 @@
 @SuppressLint("MissingNativeLoadLibrary")
 public class EventEmitterWrapper {
 
+  static {
+    FabricSoLoader.staticInit();
+  }
+
   @DoNotStrip private final HybridData mHybridData;
 
   private EventEmitterWrapper(HybridData hybridData) {