react-native 0.0.0-17be3a003 → 0.0.0-18697adec

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java

@@ -8,6 +8,7 @@
 package com.facebook.react.fabric.mounting;
 
 import static com.facebook.infer.annotation.ThreadConfined.ANY;
+import static com.facebook.infer.annotation.ThreadConfined.UI;
 
 import android.text.Spannable;
 import android.view.View;
@@ -18,7 +19,7 @@ import androidx.annotation.UiThread;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.RetryableMountingLayerException;
@@ -26,6 +27,7 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
 import com.facebook.react.fabric.FabricUIManager;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
+import com.facebook.react.fabric.mounting.mountitems.MountItem;
 import com.facebook.react.touch.JSResponderHandler;
 import com.facebook.react.uimanager.RootViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -34,6 +36,7 @@ import com.facebook.react.views.text.ReactTextViewManagerCallback;
 import com.facebook.react.views.text.TextLayoutManagerMapBuffer;
 import com.facebook.yoga.YogaMeasureMode;
 import java.util.Map;
+import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -56,10 +59,20 @@ public class MountingManager {
 
   @NonNull private final JSResponderHandler mJSResponderHandler = new JSResponderHandler();
   @NonNull private final ViewManagerRegistry mViewManagerRegistry;
+  @NonNull private final MountItemExecutor mMountItemExecutor;
   @NonNull private final RootViewManager mRootViewManager = new RootViewManager();
 
-  public MountingManager(@NonNull ViewManagerRegistry viewManagerRegistry) {
+  public interface MountItemExecutor {
+    @UiThread
+    @ThreadConfined(UI)
+    void executeItems(Queue<MountItem> items);
+  }
+
+  public MountingManager(
+      @NonNull ViewManagerRegistry viewManagerRegistry,
+      @NonNull MountItemExecutor mountItemExecutor) {
     mViewManagerRegistry = viewManagerRegistry;
+    mMountItemExecutor = mountItemExecutor;
   }
 
   /** Starts surface and attaches the root view. */
@@ -78,7 +91,11 @@ public class MountingManager {
   public SurfaceMountingManager startSurface(final int surfaceId) {
     SurfaceMountingManager surfaceMountingManager =
         new SurfaceMountingManager(
-            surfaceId, mJSResponderHandler, mViewManagerRegistry, mRootViewManager, this);
+            surfaceId,
+            mJSResponderHandler,
+            mViewManagerRegistry,
+            mRootViewManager,
+            mMountItemExecutor);
 
     // There could technically be a race condition here if addRootView is called twice from
     // different threads, though this is (probably) extremely unlikely, and likely an error.
@@ -87,7 +104,7 @@ public class MountingManager {
     // This *will* crash in Debug mode, but not in production.
     mSurfaceIdToManager.putIfAbsent(surfaceId, surfaceMountingManager);
     if (mSurfaceIdToManager.get(surfaceId) != surfaceMountingManager) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG,
           new IllegalStateException(
               "Called startSurface more than once for the SurfaceId [" + surfaceId + "]"));
@@ -104,7 +121,7 @@ public class MountingManager {
         getSurfaceManagerEnforced(surfaceId, "attachView");
 
     if (surfaceMountingManager.isStopped()) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG, new IllegalStateException("Trying to attach a view to a stopped surface"));
       return;
     }
@@ -131,7 +148,7 @@ public class MountingManager {
         mMostRecentSurfaceMountingManager = null;
       }
     } else {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG,
           new IllegalStateException(
               "Cannot call stopSurface on non-existent surface: [" + surfaceId + "]"));
@@ -149,7 +166,10 @@ public class MountingManager {
         && mMostRecentSurfaceMountingManager.getSurfaceId() == surfaceId) {
       return mMostRecentSurfaceMountingManager;
     }
-    return mSurfaceIdToManager.get(surfaceId);
+
+    SurfaceMountingManager surfaceMountingManager = mSurfaceIdToManager.get(surfaceId);
+    mLastQueriedSurfaceMountingManager = surfaceMountingManager;
+    return surfaceMountingManager;
   }
 
   @NonNull
@@ -263,13 +283,15 @@ public class MountingManager {
    * Send an accessibility eventType to a Native View. eventType is any valid `AccessibilityEvent.X`
    * value.
    *
-   * <p>Why accept `-1` SurfaceId? Currently there are calls to
-   * UIManagerModule.sendAccessibilityEvent which is a legacy API and accepts only reactTag. We will
-   * have to investigate and migrate away from those calls over time.
+   * <p>Why accept `-1` SurfaceId? Currently there are calls to UIManager.sendAccessibilityEvent
+   * which is a legacy API and accepts only reactTag. We will have to investigate and migrate away
+   * from those calls over time.
    *
-   * @param surfaceId
-   * @param reactTag
-   * @param eventType
+   * @param surfaceId {@link int} that identifies the surface or -1 to temporarily support backward
+   *     compatibility.
+   * @param reactTag {@link int} that identifies the react Tag of the view.
+   * @param eventType {@link int} that identifies Android eventType. see {@link
+   *     View#sendAccessibilityEvent}
    */
   public void sendAccessibilityEvent(int surfaceId, int reactTag, int eventType) {
     UiThreadUtil.assertOnUiThread();

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java

@@ -8,6 +8,7 @@
 package com.facebook.react.fabric.mounting;
 
 import static com.facebook.infer.annotation.ThreadConfined.ANY;
+import static com.facebook.infer.annotation.ThreadConfined.UI;
 
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,14 +19,17 @@ import androidx.annotation.UiThread;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.ThreadConfined;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactNoCrashSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.RetryableMountingLayerException;
 import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.build.ReactBuildConfig;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
+import com.facebook.react.fabric.mounting.MountingManager.MountItemExecutor;
 import com.facebook.react.fabric.mounting.mountitems.MountItem;
 import com.facebook.react.touch.JSResponderHandler;
 import com.facebook.react.uimanager.IllegalViewOperationException;
@@ -60,11 +64,10 @@ public class SurfaceMountingManager {
   private JSResponderHandler mJSResponderHandler;
   private ViewManagerRegistry mViewManagerRegistry;
   private RootViewManager mRootViewManager;
-  private MountingManager mMountingManager;
+  private MountItemExecutor mMountItemExecutor;
 
   // This is null *until* StopSurface is called.
   private Set<Integer> mTagSetForStoppedSurface;
-  private long mLastSuccessfulQueryTime = -1;
 
   private final int mSurfaceId;
 
@@ -73,13 +76,13 @@ public class SurfaceMountingManager {
       @NonNull JSResponderHandler jsResponderHandler,
       @NonNull ViewManagerRegistry viewManagerRegistry,
       @NonNull RootViewManager rootViewManager,
-      @NonNull MountingManager mountingManager) {
+      @NonNull MountItemExecutor mountItemExecutor) {
     mSurfaceId = surfaceId;
 
     mJSResponderHandler = jsResponderHandler;
     mViewManagerRegistry = viewManagerRegistry;
     mRootViewManager = rootViewManager;
-    mMountingManager = mountingManager;
+    mMountItemExecutor = mountItemExecutor;
   }
 
   public boolean isStopped() {
@@ -139,7 +142,6 @@ public class SurfaceMountingManager {
     // deleted. This helps distinguish between scenarios where an invalid tag is referenced, vs
     // race conditions where an imperative method is called on a tag during/just after StopSurface.
     if (mTagSetForStoppedSurface != null && mTagSetForStoppedSurface.contains(tag)) {
-      mLastSuccessfulQueryTime = System.currentTimeMillis();
       return true;
     }
     if (mTagToViewState == null) {
@@ -172,7 +174,7 @@ public class SurfaceMountingManager {
             }
 
             if (rootView.getId() == mSurfaceId) {
-              ReactSoftException.logSoftException(
+              ReactSoftExceptionLogger.logSoftException(
                   TAG,
                   new IllegalViewOperationException(
                       "Race condition in addRootView detected. Trying to set an id of ["
@@ -208,11 +210,9 @@ public class SurfaceMountingManager {
   }
 
   @UiThread
+  @ThreadConfined(UI)
   private void executeViewAttachMountItems() {
-    while (!mOnViewAttachItems.isEmpty()) {
-      MountItem item = mOnViewAttachItems.poll();
-      item.execute(mMountingManager);
-    }
+    mMountItemExecutor.executeItems(mOnViewAttachItems);
   }
 
   /**
@@ -251,19 +251,29 @@ public class SurfaceMountingManager {
         viewState.mStateWrapper.destroyState();
         viewState.mStateWrapper = null;
       }
+      if (ReactFeatureFlags.enableAggressiveEventEmitterCleanup) {
+        if (viewState.mEventEmitter != null) {
+          viewState.mEventEmitter.destroy();
+          viewState.mEventEmitter = null;
+        }
+      }
     }
 
     Runnable runnable =
         new Runnable() {
           @Override
           public void run() {
+            // We must call `onDropViewInstance` on all remaining Views
+            for (ViewState viewState : mTagToViewState.values()) {
+              onViewStateDeleted(viewState);
+            }
+
             // Evict all views from cache and memory
-            mLastSuccessfulQueryTime = System.currentTimeMillis();
             mTagSetForStoppedSurface = mTagToViewState.keySet();
             mTagToViewState = null;
             mJSResponderHandler = null;
             mRootViewManager = null;
-            mMountingManager = null;
+            mMountItemExecutor = null;
             mOnViewAttachItems.clear();
           }
         };
@@ -312,7 +322,7 @@ public class SurfaceMountingManager {
     if (viewParent != null) {
       int actualParentId =
           viewParent instanceof ViewGroup ? ((ViewGroup) viewParent).getId() : View.NO_ID;
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG,
           new IllegalStateException(
               "addViewAt: cannot insert view ["
@@ -370,7 +380,7 @@ public class SurfaceMountingManager {
 
     // TODO: throw exception here?
     if (parentViewState == null) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           MountingManager.TAG,
           new IllegalStateException(
               "Unable to find viewState for tag: [" + parentTag + "] for removeViewAt"));
@@ -447,7 +457,7 @@ public class SurfaceMountingManager {
       // If we can fix the bug there, or remove the need for LayoutAnimation index adjustment
       // entirely, we can just throw this exception without regression user experience.
       logViewHierarchy(parentView, true);
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG,
           new IllegalStateException(
               "Tried to remove view ["
@@ -524,14 +534,49 @@ public class SurfaceMountingManager {
       int reactTag,
       @Nullable ReadableMap props,
       @Nullable StateWrapper stateWrapper,
+      @Nullable EventEmitterWrapper eventEmitterWrapper,
       boolean isLayoutable) {
     if (isStopped()) {
       return;
     }
+    // We treat this as a perf problem and not a logical error. View Preallocation or unexpected
+    // changes to Differ or C++ Binding could cause some redundant Create instructions.
+    // This is a NoCrash soft exception because we know there are cases where preallocation happens
+    // and a node is recreated: if a node is preallocated and then committed with revision 2+,
+    // an extra CREATE instruction will be generated.
+    // This represents a perf issue only, not a correctness issue. In the future we need to
+    // refactor View preallocation to correct the currently incorrect assumptions.
     if (getNullableViewState(reactTag) != null) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Cannot CREATE view with tag [" + reactTag + "], already exists."));
       return;
     }
 
+    createViewUnsafe(
+        componentName, reactTag, props, stateWrapper, eventEmitterWrapper, isLayoutable);
+  }
+
+  /**
+   * Perform view creation without any safety checks. You must ensure safety before calling this
+   * method (see existing callsites).
+   *
+   * @param componentName
+   * @param reactTag
+   * @param props
+   * @param stateWrapper
+   * @param eventEmitterWrapper
+   * @param isLayoutable
+   */
+  @UiThread
+  public void createViewUnsafe(
+      @NonNull String componentName,
+      int reactTag,
+      @Nullable ReadableMap props,
+      @Nullable StateWrapper stateWrapper,
+      @Nullable EventEmitterWrapper eventEmitterWrapper,
+      boolean isLayoutable) {
     View view = null;
     ViewManager viewManager = null;
 
@@ -551,6 +596,7 @@ public class SurfaceMountingManager {
     ViewState viewState = new ViewState(reactTag, view, viewManager);
     viewState.mCurrentProps = propsDiffMap;
     viewState.mStateWrapper = stateWrapper;
+    viewState.mEventEmitter = eventEmitterWrapper;
 
     mTagToViewState.put(reactTag, viewState);
   }
@@ -759,7 +805,13 @@ public class SurfaceMountingManager {
       viewState = new ViewState(reactTag, null, null);
       mTagToViewState.put(reactTag, viewState);
     }
+    EventEmitterWrapper previousEventEmitterWrapper = viewState.mEventEmitter;
     viewState.mEventEmitter = eventEmitter;
+
+    // Immediately destroy native side of wrapper, instead of waiting for Java GC.
+    if (previousEventEmitterWrapper != eventEmitter && previousEventEmitterWrapper != null) {
+      previousEventEmitterWrapper.destroy();
+    }
   }
 
   @UiThread
@@ -794,6 +846,29 @@ public class SurfaceMountingManager {
     mJSResponderHandler.setJSResponder(initialReactTag, view.getParent());
   }
 
+  @UiThread
+  private void onViewStateDeleted(ViewState viewState) {
+    // Destroy state immediately instead of waiting for Java GC.
+    if (viewState.mStateWrapper != null) {
+      viewState.mStateWrapper.destroyState();
+      viewState.mStateWrapper = null;
+    }
+
+    // Destroy EventEmitterWrapper immediately instead of waiting for Java GC.
+    // Notably, this is also required to ensure that the EventEmitterWrapper is deallocated
+    // before the JS VM is deallocated, since it holds onto a JSI::Pointer.
+    if (viewState.mEventEmitter != null) {
+      viewState.mEventEmitter.destroy();
+      viewState.mEventEmitter = null;
+    }
+
+    // For non-root views we notify viewmanager with {@link ViewManager#onDropInstance}
+    ViewManager viewManager = viewState.mViewManager;
+    if (!viewState.mIsRoot && viewManager != null) {
+      viewManager.onDropViewInstance(viewState.mView);
+    }
+  }
+
   @UiThread
   public void deleteView(int reactTag) {
     UiThreadUtil.assertOnUiThread();
@@ -804,7 +879,7 @@ public class SurfaceMountingManager {
     ViewState viewState = getNullableViewState(reactTag);
 
     if (viewState == null) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           MountingManager.TAG,
           new IllegalStateException(
               "Unable to find viewState for tag: " + reactTag + " for deleteView"));
@@ -816,17 +891,7 @@ public class SurfaceMountingManager {
     // or StopSurface being called, so we do not handle deleting descendents of the View.
     mTagToViewState.remove(reactTag);
 
-    // Destroy state immediately instead of waiting for Java GC.
-    if (viewState.mStateWrapper != null) {
-      viewState.mStateWrapper.destroyState();
-      viewState.mStateWrapper = null;
-    }
-
-    // For non-root views we notify viewmanager with {@link ViewManager#onDropInstance}
-    ViewManager viewManager = viewState.mViewManager;
-    if (!viewState.mIsRoot && viewManager != null) {
-      viewManager.onDropViewInstance(viewState.mView);
-    }
+    onViewStateDeleted(viewState);
   }
 
   @UiThread
@@ -835,18 +900,25 @@ public class SurfaceMountingManager {
       int reactTag,
       @Nullable ReadableMap props,
       @Nullable StateWrapper stateWrapper,
+      @Nullable EventEmitterWrapper eventEmitterWrapper,
       boolean isLayoutable) {
     UiThreadUtil.assertOnUiThread();
+
     if (isStopped()) {
       return;
     }
-
+    // We treat this as a perf problem and not a logical error. View Preallocation or unexpected
+    // changes to Differ or C++ Binding could cause some redundant Create instructions.
     if (getNullableViewState(reactTag) != null) {
-      throw new IllegalStateException(
-          "View for component " + componentName + " with tag " + reactTag + " already exists.");
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new IllegalStateException(
+              "Cannot Preallocate view with tag [" + reactTag + "], already exists."));
+      return;
     }
 
-    createView(componentName, reactTag, props, stateWrapper, isLayoutable);
+    createViewUnsafe(
+        componentName, reactTag, props, stateWrapper, eventEmitterWrapper, isLayoutable);
   }
 
   @AnyThread
@@ -856,11 +928,21 @@ public class SurfaceMountingManager {
     return viewState == null ? null : viewState.mEventEmitter;
   }
 
-  @NonNull
-  private ViewState getViewState(int tag) {
+  @UiThread
+  public View getView(int reactTag) {
+    ViewState state = getNullableViewState(reactTag);
+    View view = state == null ? null : state.mView;
+    if (view == null) {
+      throw new IllegalViewOperationException(
+          "Trying to resolve view with tag " + reactTag + " which doesn't exist");
+    }
+    return view;
+  }
+
+  private @NonNull ViewState getViewState(int tag) {
     ViewState viewState = mTagToViewState.get(tag);
     if (viewState == null) {
-      throw new RetryableMountingLayerException("Unable to find viewState view for tag " + tag);
+      throw new RetryableMountingLayerException("Unable to find viewState for tag " + tag);
     }
     return viewState;
   }
@@ -881,6 +963,25 @@ public class SurfaceMountingManager {
     return (ViewGroupManager<ViewGroup>) viewState.mViewManager;
   }
 
+  public void printSurfaceState() {
+    FLog.e(TAG, "Views created for surface {%d}:", getSurfaceId());
+    for (ViewState viewState : mTagToViewState.values()) {
+      String viewManagerName =
+          viewState.mViewManager != null ? viewState.mViewManager.getName() : null;
+      @Nullable View view = viewState.mView;
+      @Nullable View parent = view != null ? (View) view.getParent() : null;
+      @Nullable Integer parentTag = parent != null ? parent.getId() : null;
+
+      FLog.e(
+          TAG,
+          "<%s id=%d parentTag=%s isRoot=%b />",
+          viewManagerName,
+          viewState.mReactTag,
+          parentTag,
+          viewState.mIsRoot);
+    }
+  }
+
   /**
    * This class holds view state for react tags. Objects of this class are stored into the {@link
    * #mTagToViewState}, and they should be updated in the same thread.

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java

@@ -142,6 +142,7 @@ public class IntBufferBatchMountItem implements MountItem {
               mIntBuffer[i++],
               castToProps(mObjBuffer[j++]),
               castToState(mObjBuffer[j++]),
+              castToEventEmitter(mObjBuffer[j++]),
               mIntBuffer[i++] == 1);
         } else if (type == INSTRUCTION_DELETE) {
           surfaceMountingManager.deleteView(mIntBuffer[i++]);
@@ -193,7 +194,7 @@ public class IntBufferBatchMountItem implements MountItem {
   public String toString() {
     try {
       StringBuilder s = new StringBuilder();
-      s.append("IntBufferBatchMountItem:");
+      s.append(String.format("IntBufferBatchMountItem [surface:%d]:\n", mSurfaceId));
       int i = 0, j = 0;
       while (i < mIntBufferLen) {
         int rawType = mIntBuffer[i++];
@@ -202,7 +203,7 @@ public class IntBufferBatchMountItem implements MountItem {
         for (int k = 0; k < numInstructions; k++) {
           if (type == INSTRUCTION_CREATE) {
             String componentName = getFabricComponentName((String) mObjBuffer[j++]);
-            j += 2;
+            j += 3;
             s.append(
                 String.format(
                     "CREATE [%d] - layoutable:%d - %s\n",

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.java

@@ -7,7 +7,6 @@
 
 package com.facebook.react.fabric.mounting.mountitems;
 
-import static com.facebook.react.fabric.FabricUIManager.ENABLE_FABRIC_LOGS;
 import static com.facebook.react.fabric.FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT;
 import static com.facebook.react.fabric.FabricUIManager.TAG;
 
@@ -15,6 +14,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.mounting.MountingManager;
 import com.facebook.react.fabric.mounting.SurfaceMountingManager;
 import com.facebook.react.uimanager.StateWrapper;
@@ -27,6 +27,7 @@ public class PreAllocateViewMountItem implements MountItem {
   private final int mReactTag;
   private final @Nullable ReadableMap mProps;
   private final @Nullable StateWrapper mStateWrapper;
+  private final @Nullable EventEmitterWrapper mEventEmitterWrapper;
   private final boolean mIsLayoutable;
 
   public PreAllocateViewMountItem(
@@ -35,11 +36,13 @@ public class PreAllocateViewMountItem implements MountItem {
       @NonNull String component,
       @Nullable ReadableMap props,
       @NonNull StateWrapper stateWrapper,
+      @Nullable EventEmitterWrapper eventEmitterWrapper,
       boolean isLayoutable) {
     mComponent = component;
     mSurfaceId = surfaceId;
     mProps = props;
     mStateWrapper = stateWrapper;
+    mEventEmitterWrapper = eventEmitterWrapper;
     mReactTag = reactTag;
     mIsLayoutable = isLayoutable;
   }
@@ -51,9 +54,6 @@ public class PreAllocateViewMountItem implements MountItem {
 
   @Override
   public void execute(@NonNull MountingManager mountingManager) {
-    if (ENABLE_FABRIC_LOGS) {
-      FLog.d(TAG, "Executing pre-allocation of: " + toString());
-    }
     SurfaceMountingManager surfaceMountingManager = mountingManager.getSurfaceManager(mSurfaceId);
     if (surfaceMountingManager == null) {
       FLog.e(
@@ -62,7 +62,7 @@ public class PreAllocateViewMountItem implements MountItem {
       return;
     }
     surfaceMountingManager.preallocateView(
-        mComponent, mReactTag, mProps, mStateWrapper, mIsLayoutable);
+        mComponent, mReactTag, mProps, mStateWrapper, mEventEmitterWrapper, mIsLayoutable);
   }
 
   @Override

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEvent.java

@@ -8,7 +8,7 @@
 package com.facebook.react.fabric.mounting.mountitems;
 
 import androidx.annotation.NonNull;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.RetryableMountingLayerException;
 import com.facebook.react.fabric.mounting.MountingManager;
 
@@ -38,7 +38,7 @@ public class SendAccessibilityEvent implements MountItem {
       // due to race conditions (like the view disappearing after the event is
       // queued and before it executes), we log a soft exception and continue along.
       // Other categories of errors will still cause a hard crash.
-      ReactSoftException.logSoftException(TAG, e);
+      ReactSoftExceptionLogger.logSoftException(TAG, e);
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk

@@ -15,7 +15,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti
 
-LOCAL_STATIC_LIBRARIES := libjsi libjsireact jscruntime
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni
+LOCAL_STATIC_LIBRARIES :=  libjsireact jscruntime
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libjsi
 
 include $(BUILD_SHARED_LIBRARY)

package/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.java

@@ -11,7 +11,7 @@ import android.os.Handler;
 import android.util.SparseArray;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.modules.appregistry.AppRegistry;
@@ -112,7 +112,7 @@ public class HeadlessJsTaskContext {
           .getJSModule(AppRegistry.class)
           .startHeadlessTask(taskId, taskConfig.getTaskKey(), taskConfig.getData());
     } else {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           "HeadlessJsTaskContext",
           new RuntimeException("Cannot start headless task, CatalystInstance not available"));
     }

package/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK

@@ -19,5 +19,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )

package/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK

@@ -17,5 +17,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )

package/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK

@@ -17,5 +17,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )

package/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK

@@ -32,6 +32,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/websocket:websocket"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:FBReactNativeSpec"),
+        react_native_root_target(":FBReactNativeSpec"),
     ],
 )