react-native 0.68.1 → 0.69.0-rc.1

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

@@ -26,6 +26,7 @@ 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.common.mapbuffer.ReadableMapBuffer;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.mounting.MountingManager.MountItemExecutor;
@@ -42,6 +43,9 @@ import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
+import com.facebook.react.views.view.ReactMapBufferViewManager;
+import com.facebook.react.views.view.ReactViewManagerWrapper;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -69,6 +73,14 @@ public class SurfaceMountingManager {
   // This is null *until* StopSurface is called.
   private Set<Integer> mTagSetForStoppedSurface;
 
+  // C++ layer checks for prop revision and doesn't
+  // dispatch createView mount item if view pre-allocation mount item was dispatched.
+  // This leads to missing createView and pre-mature deletion of ViewState.
+  // To work around this issue, ViewState deletion is delayed until subsequent commit.
+  // If the subsequent commit accesses ViewState, it won't be deleted.
+  private Set<Integer> mSoftDeletedViewStateTags;
+  private Set<Integer> mScheduledForDeletionViewStateTags;
+
   private final int mSurfaceId;
 
   public SurfaceMountingManager(
@@ -85,6 +97,11 @@ public class SurfaceMountingManager {
     mRootViewManager = rootViewManager;
     mMountItemExecutor = mountItemExecutor;
     mThemedReactContext = reactContext;
+
+    if (ReactFeatureFlags.enableDelayedViewStateDeletion) {
+      mSoftDeletedViewStateTags = new HashSet();
+      mScheduledForDeletionViewStateTags = new HashSet();
+    }
   }
 
   public boolean isStopped() {
@@ -163,7 +180,13 @@ public class SurfaceMountingManager {
       return;
     }
 
-    mTagToViewState.put(mSurfaceId, new ViewState(mSurfaceId, rootView, mRootViewManager, true));
+    mTagToViewState.put(
+        mSurfaceId,
+        new ViewState(
+            mSurfaceId,
+            rootView,
+            new ReactViewManagerWrapper.DefaultViewManager((ViewManager) mRootViewManager),
+            true));
 
     Runnable runnable =
         new Runnable() {
@@ -534,7 +557,7 @@ public class SurfaceMountingManager {
   public void createView(
       @NonNull String componentName,
       int reactTag,
-      @Nullable ReadableMap props,
+      @Nullable Object props,
       @Nullable StateWrapper stateWrapper,
       @Nullable EventEmitterWrapper eventEmitterWrapper,
       boolean isLayoutable) {
@@ -548,7 +571,8 @@ public class SurfaceMountingManager {
     // 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) {
+    ViewState viewState = getNullableViewState(reactTag);
+    if (viewState != null && viewState.mView != null) {
       return;
     }
 
@@ -571,41 +595,48 @@ public class SurfaceMountingManager {
   public void createViewUnsafe(
       @NonNull String componentName,
       int reactTag,
-      @Nullable ReadableMap props,
+      @Nullable Object props,
       @Nullable StateWrapper stateWrapper,
       @Nullable EventEmitterWrapper eventEmitterWrapper,
       boolean isLayoutable) {
     View view = null;
-    ViewManager viewManager = null;
+    ReactViewManagerWrapper viewManager = null;
 
-    ReactStylesDiffMap propsDiffMap = null;
-    if (props != null) {
-      propsDiffMap = new ReactStylesDiffMap(props);
+    Object propMap;
+    if (props instanceof ReadableMap) {
+      propMap = new ReactStylesDiffMap((ReadableMap) props);
+    } else {
+      propMap = props;
     }
 
     if (isLayoutable) {
-      viewManager = mViewManagerRegistry.get(componentName);
+      viewManager =
+          props instanceof ReadableMapBuffer
+              ? ReactMapBufferViewManager.INSTANCE
+              : new ReactViewManagerWrapper.DefaultViewManager(
+                  mViewManagerRegistry.get(componentName));
       // View Managers are responsible for dealing with initial state and props.
       view =
           viewManager.createView(
-              reactTag, mThemedReactContext, propsDiffMap, stateWrapper, mJSResponderHandler);
+              reactTag, mThemedReactContext, propMap, stateWrapper, mJSResponderHandler);
     }
 
     ViewState viewState = new ViewState(reactTag, view, viewManager);
-    viewState.mCurrentProps = propsDiffMap;
+    viewState.mCurrentProps = propMap;
     viewState.mStateWrapper = stateWrapper;
     viewState.mEventEmitter = eventEmitterWrapper;
 
     mTagToViewState.put(reactTag, viewState);
   }
 
-  public void updateProps(int reactTag, ReadableMap props) {
+  public void updateProps(int reactTag, Object props) {
     if (isStopped()) {
       return;
     }
 
     ViewState viewState = getViewState(reactTag);
-    viewState.mCurrentProps = new ReactStylesDiffMap(props);
+    viewState.mCurrentProps =
+        props instanceof ReadableMap ? new ReactStylesDiffMap((ReadableMap) props) : props;
     View view = viewState.mView;
 
     if (view == null) {
@@ -750,7 +781,7 @@ public class SurfaceMountingManager {
       throw new IllegalStateException("Unable to find View for tag: " + reactTag);
     }
 
-    ViewManager viewManager = viewState.mViewManager;
+    ReactViewManagerWrapper viewManager = viewState.mViewManager;
     if (viewManager == null) {
       throw new IllegalStateException("Unable to find ViewManager for view: " + viewState);
     }
@@ -800,7 +831,7 @@ public class SurfaceMountingManager {
     StateWrapper prevStateWrapper = viewState.mStateWrapper;
     viewState.mStateWrapper = stateWrapper;
 
-    ViewManager viewManager = viewState.mViewManager;
+    ReactViewManagerWrapper viewManager = viewState.mViewManager;
 
     if (viewManager == null) {
       throw new IllegalStateException("Unable to find ViewManager for tag: " + reactTag);
@@ -890,12 +921,29 @@ public class SurfaceMountingManager {
     }
 
     // For non-root views we notify viewmanager with {@link ViewManager#onDropInstance}
-    ViewManager viewManager = viewState.mViewManager;
+    ReactViewManagerWrapper viewManager = viewState.mViewManager;
     if (!viewState.mIsRoot && viewManager != null) {
       viewManager.onDropViewInstance(viewState.mView);
     }
   }
 
+  @UiThread
+  public void didUpdateViews() {
+    if (ReactFeatureFlags.enableDelayedViewStateDeletion) {
+      for (Integer reactTag : mScheduledForDeletionViewStateTags) {
+        // To delete we simply remove the tag from the registry.
+        // We want to rely on the correct set of MountInstructions being sent to the platform,
+        // or StopSurface being called, so we do not handle deleting descendents of the View.
+        ViewState viewState = mTagToViewState.remove(reactTag);
+        if (viewState != null) {
+          onViewStateDeleted(viewState);
+        }
+      }
+      mScheduledForDeletionViewStateTags = mSoftDeletedViewStateTags;
+      mSoftDeletedViewStateTags = new HashSet();
+    }
+  }
+
   @UiThread
   public void deleteView(int reactTag) {
     UiThreadUtil.assertOnUiThread();
@@ -913,19 +961,23 @@ public class SurfaceMountingManager {
       return;
     }
 
-    // To delete we simply remove the tag from the registry.
-    // We want to rely on the correct set of MountInstructions being sent to the platform,
-    // or StopSurface being called, so we do not handle deleting descendents of the View.
-    mTagToViewState.remove(reactTag);
+    if (ReactFeatureFlags.enableDelayedViewStateDeletion) {
+      mSoftDeletedViewStateTags.add(reactTag);
+    } else {
+      // To delete we simply remove the tag from the registry.
+      // We want to rely on the correct set of MountInstructions being sent to the platform,
+      // or StopSurface being called, so we do not handle deleting descendents of the View.
+      mTagToViewState.remove(reactTag);
 
-    onViewStateDeleted(viewState);
+      onViewStateDeleted(viewState);
+    }
   }
 
   @UiThread
   public void preallocateView(
       String componentName,
       int reactTag,
-      @Nullable ReadableMap props,
+      @Nullable Object props,
       @Nullable StateWrapper stateWrapper,
       @Nullable EventEmitterWrapper eventEmitterWrapper,
       boolean isLayoutable) {
@@ -967,14 +1019,21 @@ public class SurfaceMountingManager {
     if (viewState == null) {
       throw new RetryableMountingLayerException("Unable to find viewState for tag " + tag);
     }
+    if (ReactFeatureFlags.enableDelayedViewStateDeletion) {
+      mScheduledForDeletionViewStateTags.remove(tag);
+    }
     return viewState;
   }
 
   private @Nullable ViewState getNullableViewState(int tag) {
-    if (mTagToViewState == null) {
+    ConcurrentHashMap<Integer, ViewState> viewStates = mTagToViewState;
+    if (viewStates == null) {
       return null;
     }
-    return mTagToViewState.get(tag);
+    if (ReactFeatureFlags.enableDelayedViewStateDeletion) {
+      mScheduledForDeletionViewStateTags.remove(tag);
+    }
+    return viewStates.get(tag);
   }
 
   @SuppressWarnings("unchecked") // prevents unchecked conversion warn of the <ViewGroup> type
@@ -983,7 +1042,7 @@ public class SurfaceMountingManager {
     if (viewState.mViewManager == null) {
       throw new IllegalStateException("Unable to find ViewManager for view: " + viewState);
     }
-    return (ViewGroupManager<ViewGroup>) viewState.mViewManager;
+    return (ViewGroupManager<ViewGroup>) viewState.mViewManager.getViewGroupManager();
   }
 
   public void printSurfaceState() {
@@ -1013,17 +1072,22 @@ public class SurfaceMountingManager {
     @Nullable final View mView;
     final int mReactTag;
     final boolean mIsRoot;
-    @Nullable final ViewManager mViewManager;
-    @Nullable public ReactStylesDiffMap mCurrentProps = null;
+    @Nullable final ReactViewManagerWrapper mViewManager;
+    @Nullable public Object mCurrentProps = null;
     @Nullable public ReadableMap mCurrentLocalData = null;
     @Nullable public StateWrapper mStateWrapper = null;
     @Nullable public EventEmitterWrapper mEventEmitter = null;
 
-    private ViewState(int reactTag, @Nullable View view, @Nullable ViewManager viewManager) {
+    private ViewState(
+        int reactTag, @Nullable View view, @Nullable ReactViewManagerWrapper viewManager) {
       this(reactTag, view, viewManager, false);
     }
 
-    private ViewState(int reactTag, @Nullable View view, ViewManager viewManager, boolean isRoot) {
+    private ViewState(
+        int reactTag,
+        @Nullable View view,
+        @Nullable ReactViewManagerWrapper viewManager,
+        boolean isRoot) {
       mReactTag = reactTag;
       mView = view;
       mIsRoot = isRoot;

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

@@ -16,7 +16,6 @@ import com.facebook.common.logging.FLog;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
-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;
@@ -102,10 +101,6 @@ public class IntBufferBatchMountItem implements MountItem {
     return obj != null ? (StateWrapper) obj : null;
   }
 
-  private static ReadableMap castToProps(Object obj) {
-    return obj != null ? (ReadableMap) obj : null;
-  }
-
   private static EventEmitterWrapper castToEventEmitter(Object obj) {
     return obj != null ? (EventEmitterWrapper) obj : null;
   }
@@ -141,7 +136,7 @@ public class IntBufferBatchMountItem implements MountItem {
           surfaceMountingManager.createView(
               componentName,
               mIntBuffer[i++],
-              castToProps(mObjBuffer[j++]),
+              mObjBuffer[j++],
               castToState(mObjBuffer[j++]),
               castToEventEmitter(mObjBuffer[j++]),
               mIntBuffer[i++] == 1);
@@ -154,7 +149,7 @@ public class IntBufferBatchMountItem implements MountItem {
         } else if (type == INSTRUCTION_REMOVE) {
           surfaceMountingManager.removeViewAt(mIntBuffer[i++], mIntBuffer[i++], mIntBuffer[i++]);
         } else if (type == INSTRUCTION_UPDATE_PROPS) {
-          surfaceMountingManager.updateProps(mIntBuffer[i++], castToProps(mObjBuffer[j++]));
+          surfaceMountingManager.updateProps(mIntBuffer[i++], mObjBuffer[j++]);
         } else if (type == INSTRUCTION_UPDATE_STATE) {
           surfaceMountingManager.updateState(mIntBuffer[i++], castToState(mObjBuffer[j++]));
         } else if (type == INSTRUCTION_UPDATE_LAYOUT) {
@@ -193,6 +188,8 @@ public class IntBufferBatchMountItem implements MountItem {
       }
     }
 
+    surfaceMountingManager.didUpdateViews();
+
     endMarkers();
   }
 
@@ -234,10 +231,10 @@ public class IntBufferBatchMountItem implements MountItem {
                 String.format(
                     "REMOVE [%d]->[%d] @%d\n", mIntBuffer[i++], mIntBuffer[i++], mIntBuffer[i++]));
           } else if (type == INSTRUCTION_UPDATE_PROPS) {
-            ReadableMap props = castToProps(mObjBuffer[j++]);
+            Object props = mObjBuffer[j++];
             String propsString =
                 IS_DEVELOPMENT_ENVIRONMENT
-                    ? (props != null ? props.toHashMap().toString() : "<null>")
+                    ? (props != null ? props.toString() : "<null>")
                     : "<hidden>";
             s.append(String.format("UPDATE PROPS [%d]: %s\n", mIntBuffer[i++], propsString));
           } else if (type == INSTRUCTION_UPDATE_STATE) {

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

@@ -10,8 +10,10 @@ package com.facebook.react.fabric.mounting.mountitems;
 import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
+import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.fabric.mounting.MountingManager;
 
+@DoNotStrip
 public interface MountItem {
 
   /** Execute this {@link MountItem} into the operation queue received by parameter. */

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

@@ -13,7 +13,6 @@ import static com.facebook.react.fabric.FabricUIManager.TAG;
 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;
@@ -25,7 +24,7 @@ public class PreAllocateViewMountItem implements MountItem {
   @NonNull private final String mComponent;
   private final int mSurfaceId;
   private final int mReactTag;
-  private final @Nullable ReadableMap mProps;
+  private final @Nullable Object mProps;
   private final @Nullable StateWrapper mStateWrapper;
   private final @Nullable EventEmitterWrapper mEventEmitterWrapper;
   private final boolean mIsLayoutable;
@@ -34,7 +33,7 @@ public class PreAllocateViewMountItem implements MountItem {
       int surfaceId,
       int reactTag,
       @NonNull String component,
-      @Nullable ReadableMap props,
+      @Nullable Object props,
       @NonNull StateWrapper stateWrapper,
       @Nullable EventEmitterWrapper eventEmitterWrapper,
       boolean isLayoutable) {

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

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jscexecutor
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
@@ -19,7 +20,7 @@ LOCAL_STATIC_LIBRARIES :=  libjsireact jscruntime
 LOCAL_SHARED_LIBRARIES := \
   libfb \
   libfbjni \
-  libfolly_json \
+  libfolly_runtime \
   libjsi \
   libreactnativejni
 

package/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK

@@ -4,7 +4,10 @@ rn_android_library(
     name = "jscexecutor",
     srcs = glob(["*.java"]),
     autoglob = False,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/CMakeLists.txt

@@ -0,0 +1,23 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fvisibility=hidden -fexceptions -frtti)
+
+file(GLOB jscexecutor_SRC CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
+add_library(jscexecutor SHARED ${jscexecutor_SRC})
+
+target_include_directories(jscexecutor PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(jscexecutor
+        jsireact
+        jscruntime
+        fb
+        fbjni
+        folly_runtime
+        jsi
+        reactnativejni)

package/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK

@@ -4,7 +4,10 @@ rn_android_library(
     name = "jstasks",
     srcs = glob(["*.java"]),
     autoglob = False,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

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

@@ -61,9 +61,15 @@ public class HeadlessJsTaskContext {
     mReactContext = new WeakReference<ReactContext>(reactContext);
   }
 
-  /** Register a task lifecycle event listener. */
-  public void addTaskEventListener(HeadlessJsTaskEventListener listener) {
+  /**
+   * Register a task lifecycle event listener. Synchronized in order to prevent race conditions with
+   * finishTask, as the listener will be invoked for already running tasks.
+   */
+  public synchronized void addTaskEventListener(HeadlessJsTaskEventListener listener) {
     mHeadlessJsTaskEventListeners.add(listener);
+    for (Integer activeTaskId : mActiveTasks) {
+      listener.onHeadlessJsTaskStart(activeTaskId);
+    }
   }
 
   /** Unregister a task lifecycle event listener. */

package/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK

@@ -4,7 +4,10 @@ rn_android_library(
     name = "annotations",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",

package/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK

@@ -4,7 +4,10 @@ rn_android_library(
     name = "model",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK

@@ -15,10 +15,15 @@ rn_java_annotation_processor(
 rn_java_library(
     name = "processing-lib",
     srcs = glob(["*.java"]),
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     source = "8",
     target = "8",
     deps = [
+        react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
+        react_native_target("java/com/facebook/react/common:common"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/javapoet:javapoet"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),

package/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java

@@ -10,7 +10,9 @@ package com.facebook.react.module.processing;
 import static javax.lang.model.element.Modifier.PUBLIC;
 import static javax.tools.Diagnostic.Kind.ERROR;
 
+import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.SuppressFieldNotInitialized;
+import com.facebook.react.common.ReactConstants;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.module.annotations.ReactModuleList;
 import com.facebook.react.module.model.ReactModuleInfo;
@@ -87,7 +89,15 @@ public class ReactModuleSpecProcessor extends AbstractProcessor {
       }
 
       TypeElement typeElement = (TypeElement) reactModuleListElement;
-      ReactModuleList reactModuleList = typeElement.getAnnotation(ReactModuleList.class);
+
+      ReactModuleList reactModuleList = null;
+      try {
+        reactModuleList = typeElement.getAnnotation(ReactModuleList.class);
+      } catch (Exception ex) {
+        FLog.i(
+            ReactConstants.TAG, "Could not reactModuleList from typeElement.getAnnotation()", ex);
+        throw ex;
+      }
 
       if (reactModuleList == null) {
         continue;

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

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["**/*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

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

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["**/*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

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

@@ -4,7 +4,10 @@ rn_android_library(
     name = "appregistry",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

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

@@ -4,7 +4,10 @@ rn_android_library(
     name = "appstate",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

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

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["**/*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),

package/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := reactnativeblob
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
@@ -19,7 +20,7 @@ LOCAL_STATIC_LIBRARIES :=  libjsireact
 LOCAL_SHARED_LIBRARIES := \
   libfb \
   libfbjni \
-  libfolly_json \
+  libfolly_runtime \
   libjsi \
   libreactnativejni
 

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

@@ -5,7 +5,10 @@ rn_xplat_cxx_library(
     srcs = glob(["*.cpp"]),
     headers = glob(["*.h"]),
     header_namespace = "",
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     platforms = ANDROID,
     soname = "libreactnativeblob.$(ext)",
     visibility = ["PUBLIC"],

package/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fvisibility=hidden -fexceptions -frtti)
+
+file(GLOB reactnativeblob_SRC CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
+add_library(reactnativeblob SHARED ${reactnativeblob_SRC})
+
+target_include_directories(reactnativeblob PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(reactnativeblob
+        jsireact
+        fb
+        fbjni
+        folly_runtime
+        jsi
+        reactnativejni)

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

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
     ],