Skip to content

Commit a2d2696

Browse files
generatedunixname89002005232357facebook-github-bot
authored andcommitted
Revert D44153451: Multisect successfully blamed D44153451 for test or build failures (#36756)
Summary: Pull Request resolved: #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
1 parent 86859e3 commit a2d2696

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricSoLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import com.facebook.soloader.SoLoader;
1515
import com.facebook.systrace.Systrace;
1616

17-
class FabricSoLoader {
17+
public class FabricSoLoader {
1818
private static volatile boolean sDidInit = false;
1919

2020
public static void staticInit() {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@
9191
@SuppressLint("MissingNativeLoadLibrary")
9292
@DoNotStripAny
9393
public class FabricUIManager implements UIManager, LifecycleEventListener {
94-
static {
95-
FabricSoLoader.staticInit();
96-
}
97-
9894
public static final String TAG = FabricUIManager.class.getSimpleName();
9995

10096
// 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
155151
}
156152
};
157153

154+
static {
155+
FabricSoLoader.staticInit();
156+
}
157+
158158
@Nullable private Binding mBinding;
159159
@NonNull private final ReactApplicationContext mReactApplicationContext;
160160
@NonNull private final MountingManager mMountingManager;

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.facebook.jni.HybridData;
1313
import com.facebook.proguard.annotations.DoNotStrip;
1414
import com.facebook.react.bridge.ReactApplicationContext;
15+
import com.facebook.react.fabric.FabricSoLoader;
1516
import com.facebook.react.uimanager.events.BatchEventDispatchedListener;
1617

1718
/**
@@ -20,6 +21,10 @@
2021
@SuppressLint("MissingNativeLoadLibrary")
2122
public class EventBeatManager implements BatchEventDispatchedListener {
2223

24+
static {
25+
FabricSoLoader.staticInit();
26+
}
27+
2328
@DoNotStrip private final HybridData mHybridData;
2429
private final ReactApplicationContext mReactApplicationContext;
2530

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.facebook.proguard.annotations.DoNotStrip;
1515
import com.facebook.react.bridge.NativeMap;
1616
import com.facebook.react.bridge.WritableMap;
17+
import com.facebook.react.fabric.FabricSoLoader;
1718
import com.facebook.react.uimanager.events.EventCategoryDef;
1819

1920
/**
@@ -23,6 +24,10 @@
2324
@SuppressLint("MissingNativeLoadLibrary")
2425
public class EventEmitterWrapper {
2526

27+
static {
28+
FabricSoLoader.staticInit();
29+
}
30+
2631
@DoNotStrip private final HybridData mHybridData;
2732

2833
private EventEmitterWrapper(HybridData hybridData) {

0 commit comments

Comments
 (0)