react-native 0.0.0-263478b91 → 0.0.0-268efb102

package/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java

@@ -15,6 +15,7 @@ import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
 import com.facebook.react.common.LifecycleState;
+import com.facebook.react.devsupport.DevSupportManagerFactory;
 import com.facebook.react.devsupport.RedBoxHandler;
 import com.facebook.react.uimanager.UIImplementationProvider;
 import java.util.List;
@@ -68,6 +69,8 @@ public abstract class ReactNativeHost {
             .setApplication(mApplication)
             .setJSMainModulePath(getJSMainModuleName())
             .setUseDeveloperSupport(getUseDeveloperSupport())
+            .setDevSupportManagerFactory(getDevSupportManagerFactory())
+            .setRequireActivity(getShouldRequireActivity())
             .setRedBoxHandler(getRedBoxHandler())
             .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
             .setUIImplementationProvider(getUIImplementationProvider())
@@ -124,6 +127,11 @@ public abstract class ReactNativeHost {
     return null;
   }
 
+  /** Returns whether or not to treat it as normal if Activity is null. */
+  public boolean getShouldRequireActivity() {
+    return true;
+  }
+
   /**
    * Returns the name of the main module. Determines the URL used to fetch the JS bundle from Metro.
    * It is only used when dev support is enabled. This is the first file to be executed once the
@@ -154,6 +162,11 @@ public abstract class ReactNativeHost {
   /** Returns whether dev mode should be enabled. This enables e.g. the dev menu. */
   public abstract boolean getUseDeveloperSupport();
 
+  /** Get the {@link DevSupportManagerFactory}. Override this to use a custom dev support manager */
+  protected @Nullable DevSupportManagerFactory getDevSupportManagerFactory() {
+    return null;
+  }
+
   /**
    * Returns a list of {@link ReactPackage} used by the app. You'll most likely want to return at
    * least the {@code MainReactPackage}. If your app uses additional views or modules besides the

package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -35,7 +35,8 @@ import com.facebook.react.bridge.CatalystInstance;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactNoCrashSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
@@ -49,6 +50,7 @@ import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.JSTouchDispatcher;
 import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.ReactClippingProhibitedView;
 import com.facebook.react.uimanager.ReactRoot;
 import com.facebook.react.uimanager.RootView;
 import com.facebook.react.uimanager.RootViewUtil;
@@ -329,9 +331,29 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
   }
 
   @Override
-  public void onViewAdded(View child) {
+  public void onViewAdded(final View child) {
     super.onViewAdded(child);
 
+    // See comments in {@code ReactRootViewProhibitedChildView} for why we want this mechanism.
+    if (child instanceof ReactClippingProhibitedView) {
+      UiThreadUtil.runOnUiThread(
+          new Runnable() {
+            @Override
+            public void run() {
+              if (!child.isShown()) {
+                ReactSoftExceptionLogger.logSoftException(
+                    TAG,
+                    new ReactNoCrashSoftException(
+                        "A view was illegally added as a child of a ReactRootView. "
+                            + "This View should not be a direct child of a ReactRootView, because it is not visible and will never be reachable. Child: "
+                            + child.getClass().getCanonicalName().toString()
+                            + " child ID: "
+                            + child.getId()));
+              }
+            }
+          });
+    }
+
     if (mShouldLogContentAppeared) {
       mShouldLogContentAppeared = false;
 
@@ -507,7 +529,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
           removeAllViews();
 
           if (surfaceId == NO_ID) {
-            ReactSoftException.logSoftException(
+            ReactSoftExceptionLogger.logSoftException(
                 TAG,
                 new RuntimeException(
                     "unmountReactApplication called on ReactRootView with invalid id"));

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

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

package/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java

@@ -17,7 +17,7 @@ import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UIManagerListener;
@@ -365,7 +365,7 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
     if (nodesManager != null) {
       nodesManager.initializeEventListenerForUIManagerType(mUIManagerType);
     } else {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           NAME,
           new RuntimeException(
               "initializeLifecycleEventListenersForViewTag could not get NativeAnimatedNodesManager"));

package/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java

@@ -17,7 +17,7 @@ import com.facebook.react.bridge.JSApplicationCausedNativeException;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
-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.UIManager;
@@ -391,7 +391,7 @@ import java.util.Queue;
     UIManager uiManager =
         UIManagerHelper.getUIManagerForReactTag(mReactApplicationContext, viewTag);
     if (uiManager == null) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG,
           new ReactNoCrashSoftException(
               "connectAnimatedNodeToView: Animated node could not be connected to UIManager - uiManager disappeared for tag: "
@@ -535,7 +535,7 @@ import java.util.Queue;
         return;
       }
       UIManager uiManager =
-          UIManagerHelper.getUIManagerForReactTag(mReactApplicationContext, event.getViewTag());
+          UIManagerHelper.getUIManager(mReactApplicationContext, event.getUIManagerType());
       if (uiManager == null) {
         return;
       }
@@ -753,11 +753,11 @@ import java.util.Queue;
       if (mEventListenerInitializedForFabric && cyclesDetected == 0) {
         // TODO T71377544: investigate these SoftExceptions and see if we can remove entirely
         // or fix the root cause
-        ReactSoftException.logSoftException(TAG, new ReactNoCrashSoftException(ex));
+        ReactSoftExceptionLogger.logSoftException(TAG, new ReactNoCrashSoftException(ex));
       } else if (mEventListenerInitializedForFabric) {
         // TODO T71377544: investigate these SoftExceptions and see if we can remove entirely
         // or fix the root cause
-        ReactSoftException.logSoftException(TAG, new ReactNoCrashSoftException(ex));
+        ReactSoftExceptionLogger.logSoftException(TAG, new ReactNoCrashSoftException(ex));
       } else {
         throw ex;
       }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/BackgroundExecutor.java

@@ -30,13 +30,14 @@ public class BackgroundExecutor {
     // but it's also cheap to leave it here.
 
     if (runnable == null) {
-      ReactSoftException.logSoftException(TAG, new ReactNoCrashSoftException("runnable is null"));
+      ReactSoftExceptionLogger.logSoftException(
+          TAG, new ReactNoCrashSoftException("runnable is null"));
       return;
     }
 
     final ExecutorService executorService = mExecutorService;
     if (executorService == null) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG, new ReactNoCrashSoftException("executorService is null"));
       return;
     }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java

@@ -111,6 +111,10 @@ public interface CatalystInstance
 
   RuntimeExecutor getRuntimeExecutor();
 
+  RuntimeScheduler getRuntimeScheduler();
+
+  void installRuntimeScheduler();
+
   void addJSIModules(List<JSIModuleSpec> jsiModules);
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java

@@ -139,6 +139,11 @@ public class CatalystInstanceImpl implements CatalystInstance {
 
     FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "initializeCxxBridge");
+
+    if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+      warnOnLegacyNativeModuleSystemUse();
+    }
+
     initializeBridge(
         new BridgeCallback(this),
         jsExecutor,
@@ -206,6 +211,8 @@ public class CatalystInstanceImpl implements CatalystInstance {
   private native void jniExtendNativeModules(
       Collection<JavaModuleWrapper> javaModules, Collection<ModuleHolder> cxxModules);
 
+  private native void warnOnLegacyNativeModuleSystemUse();
+
   private native void initializeBridge(
       ReactCallback callback,
       JavaScriptExecutor jsExecutor,
@@ -549,12 +556,11 @@ public class CatalystInstanceImpl implements CatalystInstance {
     return mJavaScriptContextHolder;
   }
 
-  @Override
-  public RuntimeExecutor getRuntimeExecutor() {
-    return getRuntimeExecutor(ReactFeatureFlags.enableRuntimeExecutorFlushing());
-  }
+  public native RuntimeExecutor getRuntimeExecutor();
+
+  public native RuntimeScheduler getRuntimeScheduler();
 
-  public native RuntimeExecutor getRuntimeExecutor(boolean shouldFlush);
+  public native void installRuntimeScheduler();
 
   @Override
   public void addJSIModules(List<JSIModuleSpec> jsiModules) {

package/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java

@@ -15,6 +15,7 @@ import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
 
 import androidx.annotation.Nullable;
 import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
 import java.lang.reflect.Method;
@@ -43,6 +44,7 @@ public class JavaModuleWrapper {
   private final ModuleHolder mModuleHolder;
   private final ArrayList<NativeModule.NativeMethod> mMethods;
   private final ArrayList<MethodDescriptor> mDescs;
+  private static final String TAG = JavaModuleWrapper.class.getSimpleName();
 
   public JavaModuleWrapper(JSInstance jsInstance, ModuleHolder moduleHolder) {
     mJSInstance = jsInstance;
@@ -113,6 +115,17 @@ public class JavaModuleWrapper {
 
   @DoNotStrip
   public @Nullable NativeMap getConstants() {
+    if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Calling getConstants() on Java NativeModule (name = \""
+                  + mModuleHolder.getName()
+                  + "\", className = "
+                  + mModuleHolder.getClassName()
+                  + ")."));
+    }
+
     if (!mModuleHolder.getHasConstants()) {
       return null;
     }
@@ -144,10 +157,34 @@ public class JavaModuleWrapper {
 
   @DoNotStrip
   public void invoke(int methodId, ReadableNativeArray parameters) {
+    if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Calling method on Java NativeModule (name = \""
+                  + mModuleHolder.getName()
+                  + "\", className = "
+                  + mModuleHolder.getClassName()
+                  + ")."));
+    }
+
     if (mMethods == null || methodId >= mMethods.size()) {
       return;
     }
 
+    if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Calling "
+                  + mDescs.get(methodId).name
+                  + "() on Java NativeModule (name = \""
+                  + mModuleHolder.getName()
+                  + "\", className = "
+                  + mModuleHolder.getClassName()
+                  + ")."));
+    }
+
     mMethods.get(methodId).invoke(mJSInstance, parameters);
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java

@@ -21,6 +21,7 @@ public class NativeModuleRegistry {
 
   private final ReactApplicationContext mReactApplicationContext;
   private final Map<String, ModuleHolder> mModules;
+  private final String TAG = NativeModuleRegistry.class.getSimpleName();
 
   public NativeModuleRegistry(
       ReactApplicationContext reactApplicationContext, Map<String, ModuleHolder> modules) {
@@ -41,6 +42,17 @@ public class NativeModuleRegistry {
     ArrayList<JavaModuleWrapper> javaModules = new ArrayList<>();
     for (Map.Entry<String, ModuleHolder> entry : mModules.entrySet()) {
       if (!entry.getValue().isCxxModule()) {
+        if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+          ReactSoftExceptionLogger.logSoftException(
+              TAG,
+              new ReactNoCrashSoftException(
+                  "Registering legacy NativeModule: Java NativeModule (name = \""
+                      + entry.getValue().getName()
+                      + "\", className = "
+                      + entry.getValue().getClassName()
+                      + ")."));
+        }
+
         javaModules.add(new JavaModuleWrapper(jsInstance, entry.getValue()));
       }
     }
@@ -51,6 +63,16 @@ public class NativeModuleRegistry {
     ArrayList<ModuleHolder> cxxModules = new ArrayList<>();
     for (Map.Entry<String, ModuleHolder> entry : mModules.entrySet()) {
       if (entry.getValue().isCxxModule()) {
+        if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+          ReactSoftExceptionLogger.logSoftException(
+              TAG,
+              new ReactNoCrashSoftException(
+                  "Registering legacy NativeModule: Cxx NativeModule (name = \""
+                      + entry.getValue().getName()
+                      + "\", className = "
+                      + entry.getValue().getClassName()
+                      + ")."));
+        }
         cxxModules.add(entry.getValue());
       }
     }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java

@@ -78,7 +78,7 @@ public class ReactContext extends ContextWrapper {
       throw new IllegalStateException("ReactContext has been already initialized");
     }
     if (mDestroyed) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG,
           new IllegalStateException("Cannot initialize ReactContext after it has been destroyed."));
     }
@@ -89,11 +89,8 @@ public class ReactContext extends ContextWrapper {
     initializeMessageQueueThreads(queueConfig);
   }
 
-  /**
-   * Initialize message queue threads using a ReactQueueConfiguration. TODO (janzer) T43898341 Make
-   * this package instead of public
-   */
-  public void initializeMessageQueueThreads(ReactQueueConfiguration queueConfig) {
+  /** Initialize message queue threads using a ReactQueueConfiguration. */
+  public synchronized void initializeMessageQueueThreads(ReactQueueConfiguration queueConfig) {
     if (mUiMessageQueueThread != null
         || mNativeModulesMessageQueueThread != null
         || mJSMessageQueueThread != null) {

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java

@@ -63,7 +63,7 @@ public abstract class ReactContextBaseJavaModule extends BaseJavaModule {
     if (ReactBuildConfig.DEBUG) {
       FLog.w(tag, msg);
     } else {
-      ReactSoftException.logSoftException(tag, new RuntimeException(msg));
+      ReactSoftExceptionLogger.logSoftException(tag, new RuntimeException(msg));
     }
     return null;
   }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.bridge;
+
+import com.facebook.common.logging.FLog;
+import com.facebook.proguard.annotations.DoNotStrip;
+import java.lang.reflect.Method;
+
+@DoNotStrip
+public class ReactCxxErrorHandler {
+
+  private static Method mHandleErrorFunc;
+  private static Object mObject;
+
+  @DoNotStrip
+  public static void setHandleErrorFunc(Object object, Method handleErrorFunc) {
+    mObject = object;
+    mHandleErrorFunc = handleErrorFunc;
+  }
+
+  @DoNotStrip
+  // For use from within the C++ JReactCxxErrorHandler
+  private static void handleError(final String message) {
+    if (mHandleErrorFunc != null) {
+      try {
+        Object[] parameters = new Object[1];
+        parameters[0] = new Exception(message);
+        mHandleErrorFunc.invoke(mObject, parameters);
+      } catch (Exception e) {
+        FLog.e("ReactCxxErrorHandler", "Failed to invole error hanlder function", e);
+      }
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java

@@ -119,5 +119,7 @@ public enum ReactMarkerConstants {
   REACT_BRIDGE_LOADING_START,
   REACT_BRIDGE_LOADING_END,
   REACT_BRIDGELESS_LOADING_START,
-  REACT_BRIDGELESS_LOADING_END
+  REACT_BRIDGELESS_LOADING_END,
+  LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_START,
+  LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_END,
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/{ReactSoftException.java → ReactSoftExceptionLogger.java}

@@ -13,9 +13,7 @@ import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 @DoNotStrip
-@Deprecated
-// TODO T53446395: unify ReactSoftException with a more generic exception-handling utility
-public class ReactSoftException {
+public class ReactSoftExceptionLogger {
   public interface ReactSoftExceptionListener {
     void logSoftException(final String category, final Throwable cause);
   }
@@ -52,4 +50,11 @@ public class ReactSoftException {
       FLog.e(category, "Unhandled SoftException", cause);
     }
   }
+
+  @DoNotStrip
+  // For use from within the C++ JReactSoftExceptionLogger
+  private static void logNoThrowSoftExceptionWithMessage(
+      final String category, final String message) {
+    logSoftException(category, new ReactNoCrashSoftException(message));
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/RuntimeScheduler.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.bridge;
+
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+/** A Java holder for a C++ RuntimeScheduler. */
+public class RuntimeScheduler {
+
+  @DoNotStrip private HybridData mHybridData;
+
+  public RuntimeScheduler(HybridData hybridData) {
+    mHybridData = hybridData;
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java

@@ -20,31 +20,32 @@ public class SoftAssertions {
   /**
    * Throw {@link AssertionException} with a given message. Use this method surrounded with {@code
    * if} block with assert condition in case you plan to do string concatenation to produce the
-   * message. This logs an assertion with ReactSoftException, which decides whether or not to
+   * message. This logs an assertion with ReactSoftExceptionLogger, which decides whether or not to
    * actually throw.
    */
   public static void assertUnreachable(String message) {
-    ReactSoftException.logSoftException("SoftAssertions", new AssertionException(message));
+    ReactSoftExceptionLogger.logSoftException("SoftAssertions", new AssertionException(message));
   }
 
   /**
    * Asserts the given condition, throwing an {@link AssertionException} if the condition doesn't
-   * hold. This logs an assertion with ReactSoftException, which decides whether or not to actually
-   * throw.
+   * hold. This logs an assertion with ReactSoftExceptionLogger, which decides whether or not to
+   * actually throw.
    */
   public static void assertCondition(boolean condition, String message) {
     if (!condition) {
-      ReactSoftException.logSoftException("SoftAssertions", new AssertionException(message));
+      ReactSoftExceptionLogger.logSoftException("SoftAssertions", new AssertionException(message));
     }
   }
 
   /**
    * Asserts that the given Object isn't null, throwing an {@link AssertionException} if it was.
-   * This logs an assertion with ReactSoftException, which decides whether or not to actually throw.
+   * This logs an assertion with ReactSoftExceptionLogger, which decides whether or not to actually
+   * throw.
    */
   public static <T> T assertNotNull(@Nullable T instance) {
     if (instance == null) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           "SoftAssertions", new AssertionException("Expected object to not be null!"));
     }
     return instance;

package/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java

@@ -117,6 +117,16 @@ public interface UIManager extends JSIModule, PerformanceCounter {
    */
   void removeUIManagerEventListener(UIManagerListener listener);
 
+  /**
+   * Resolves a view based on its reactTag. Do not mutate properties on this view that are already
+   * managed by React, as there are no guarantees this changes will be preserved.
+   *
+   * @throws IllegalViewOperationException if tag could not be resolved.
+   * @param reactTag tag
+   * @return view if found
+   */
+  View resolveView(int reactTag);
+
   /**
    * This method dispatches events from RN Android code to JS. The delivery of this event will not
    * be queued in EventDispatcher class.

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

@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_build_config", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "HERMES_BYTECODE_VERSION", "react_native_dep", "rn_android_build_config", "rn_android_library")
 
 SUB_PROJECTS = [
     "network/**/*",
@@ -41,7 +41,7 @@ rn_android_build_config(
     package = "com.facebook.react",
     values = [
         "boolean IS_INTERNAL_BUILD = true",
-        "int HERMES_BYTECODE_VERSION = 0",
+        "int HERMES_BYTECODE_VERSION = {}".format(HERMES_BYTECODE_VERSION),
     ],
     visibility = [
         "PUBLIC",

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK

@@ -21,6 +21,9 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_target("java/com/facebook/react/common:common"),
+        # dependencies used for systraces
+        react_native_dep("java/com/facebook/systrace:systrace"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
     ],
     exported_deps = [],
 )

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.java

@@ -10,7 +10,6 @@ package com.facebook.react.common.mapbuffer;
 import androidx.annotation.Nullable;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.soloader.SoLoader;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Iterator;
@@ -23,7 +22,7 @@ import java.util.Iterator;
 public class ReadableMapBuffer implements Iterable<ReadableMapBuffer.MapBufferEntry> {
 
   static {
-    SoLoader.loadLibrary("mapbufferjni");
+    ReadableMapBufferSoLoader.staticInit();
   }
 
   // Value used to verify if the data is serialized with LittleEndian order.

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBufferSoLoader.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.common.mapbuffer;
+
+import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
+
+import com.facebook.react.bridge.ReactMarker;
+import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.soloader.SoLoader;
+import com.facebook.systrace.Systrace;
+
+public class ReadableMapBufferSoLoader {
+  private static volatile boolean sDidInit = false;
+
+  public static void staticInit() {
+    if (sDidInit) {
+      return;
+    }
+    Systrace.beginSection(
+        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
+        "ReadableMapBufferSoLoader.staticInit::load:mapbufferjni");
+    ReactMarker.logMarker(ReactMarkerConstants.LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_START);
+    SoLoader.loadLibrary("mapbufferjni");
+    ReactMarker.logMarker(ReactMarkerConstants.LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_END);
+    Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+    sDidInit = true;
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/BUCK

@@ -19,7 +19,7 @@ rn_xplat_cxx_library(
     ],
     fbandroid_allow_jni_merging = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
-    platforms = (ANDROID),
+    platforms = ANDROID,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",