Skip to content

Commit

Permalink
Revert D44153451: Multisect successfully blamed D44153451 for test or…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
generatedunixname89002005232357 authored and facebook-github-bot committed Apr 1, 2023
1 parent 86859e3 commit a2d2696
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -20,6 +21,10 @@
@SuppressLint("MissingNativeLoadLibrary")
public class EventBeatManager implements BatchEventDispatchedListener {

static {
FabricSoLoader.staticInit();
}

@DoNotStrip private final HybridData mHybridData;
private final ReactApplicationContext mReactApplicationContext;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -23,6 +24,10 @@
@SuppressLint("MissingNativeLoadLibrary")
public class EventEmitterWrapper {

static {
FabricSoLoader.staticInit();
}

@DoNotStrip private final HybridData mHybridData;

private EventEmitterWrapper(HybridData hybridData) {
Expand Down

0 comments on commit a2d2696

Please sign in to comment.