react-native-tvos 0.75.3-0 → 0.76.0-0

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java

@@ -12,10 +12,12 @@ import android.content.pm.PackageManager;
 import android.graphics.Rect;
 import android.util.Log;
 import android.view.View;
+import androidx.annotation.ColorInt;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.bridge.DynamicFromObject;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
@@ -25,7 +27,9 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.BackgroundStyleApplicator;
 import com.facebook.react.uimanager.LengthPercentage;
 import com.facebook.react.uimanager.LengthPercentageType;
 import com.facebook.react.uimanager.PixelUtil;
@@ -39,13 +43,18 @@ import com.facebook.react.uimanager.annotations.ReactPropGroup;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.events.EventDispatcher;
+import com.facebook.react.uimanager.style.BackgroundImageLayer;
 import com.facebook.react.uimanager.style.BorderRadiusProp;
+import com.facebook.react.uimanager.style.BorderStyle;
+import com.facebook.react.uimanager.style.LogicalEdge;
+import java.util.ArrayList;
+import java.util.List;
 import com.facebook.yoga.YogaConstants;
-
 import java.util.Map;
 
 /** View manager for AndroidViews (plain React Views). */
 @ReactModule(name = ReactViewManager.REACT_CLASS)
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
 
   @VisibleForTesting public static final String REACT_CLASS = ViewProps.VIEW_CLASS_NAME;
@@ -74,13 +83,13 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
   }
 
   @Override
-  protected ReactViewGroup prepareToRecycleView(
-      @NonNull ThemedReactContext reactContext, ReactViewGroup view) {
+  protected @Nullable ReactViewGroup prepareToRecycleView(
+      ThemedReactContext reactContext, ReactViewGroup view) {
     // BaseViewManager
-    super.prepareToRecycleView(reactContext, view);
-
-    view.recycleView();
-
+    ReactViewGroup preparedView = super.prepareToRecycleView(reactContext, view);
+    if (preparedView != null) {
+      preparedView.recycleView();
+    }
     return view;
   }
 
@@ -106,6 +115,23 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
     }
   }
 
+  @ReactProp(name = ViewProps.BACKGROUND_IMAGE, customType = "BackgroundImage")
+  public void setBackgroundImage(ReactViewGroup view, @Nullable ReadableArray backgroundImage) {
+    if (ViewUtil.getUIManagerType(view) == UIManagerType.FABRIC) {
+      if (backgroundImage != null && backgroundImage.size() > 0) {
+        List<BackgroundImageLayer> backgroundImageLayers = new ArrayList<>(backgroundImage.size());
+        for (int i = 0; i < backgroundImage.size(); i++) {
+          ReadableMap backgroundImageMap = backgroundImage.getMap(i);
+          BackgroundImageLayer layer = new BackgroundImageLayer(backgroundImageMap);
+          backgroundImageLayers.add(layer);
+        }
+        view.setBackgroundImage(backgroundImageLayers);
+      } else {
+        view.setBackgroundImage(null);
+      }
+    }
+  }
+
   @ReactProp(name = "nextFocusDown", defaultInt = View.NO_ID)
   public void nextFocusDown(ReactViewGroup view, int viewId) {
     view.setNextFocusDownId(viewId);
@@ -154,23 +180,36 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
     // avoid developer surprise if it works on one platform but not another).
     if (ViewUtil.getUIManagerType(view) != UIManagerType.FABRIC
         && borderRadius != null
-        && borderRadius.getUnit() == LengthPercentageType.PERCENT) {
+        && borderRadius.getType() == LengthPercentageType.PERCENT) {
       borderRadius = null;
     }
 
-    view.setBorderRadius(BorderRadiusProp.values()[index], borderRadius);
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.setBorderRadius(
+          view, BorderRadiusProp.values()[index], borderRadius);
+    } else {
+      view.setBorderRadius(BorderRadiusProp.values()[index], borderRadius);
+    }
   }
 
   /**
    * @deprecated Use {@link #setBorderRadius(ReactViewGroup, int, Dynamic)} instead.
    */
+  @Deprecated(since = "0.75.0", forRemoval = true)
   public void setBorderRadius(ReactViewGroup view, int index, float borderRadius) {
     setBorderRadius(view, index, new DynamicFromObject(borderRadius));
   }
 
   @ReactProp(name = "borderStyle")
   public void setBorderStyle(ReactViewGroup view, @Nullable String borderStyle) {
-    view.setBorderStyle(borderStyle);
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      @Nullable
+      BorderStyle parsedBorderStyle =
+          borderStyle == null ? null : BorderStyle.fromString(borderStyle);
+      BackgroundStyleApplicator.setBorderStyle(view, parsedBorderStyle);
+    } else {
+      view.setBorderStyle(borderStyle);
+    }
   }
 
   @ReactProp(name = "hitSlop")
@@ -243,17 +282,21 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
         ViewProps.BORDER_START_WIDTH,
         ViewProps.BORDER_END_WIDTH,
       },
-      defaultFloat = YogaConstants.UNDEFINED)
+      defaultFloat = Float.NaN)
   public void setBorderWidth(ReactViewGroup view, int index, float width) {
-    if (!YogaConstants.isUndefined(width) && width < 0) {
-      width = YogaConstants.UNDEFINED;
-    }
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.setBorderWidth(view, LogicalEdge.values()[index], width);
+    } else {
+      if (!Float.isNaN(width) && width < 0) {
+        width = Float.NaN;
+      }
 
-    if (!YogaConstants.isUndefined(width)) {
-      width = PixelUtil.toPixelFromDIP(width);
-    }
+      if (!Float.isNaN(width)) {
+        width = PixelUtil.toPixelFromDIP(width);
+      }
 
-    view.setBorderWidth(SPACING_TYPES[index], width);
+      view.setBorderWidth(SPACING_TYPES[index], width);
+    }
   }
 
   @ReactPropGroup(
@@ -270,11 +313,13 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
         ViewProps.BORDER_BLOCK_START_COLOR
       },
       customType = "Color")
-  public void setBorderColor(ReactViewGroup view, int index, Integer color) {
-    float rgbComponent =
-        color == null ? YogaConstants.UNDEFINED : (float) ((int) color & 0x00FFFFFF);
-    float alphaComponent = color == null ? YogaConstants.UNDEFINED : (float) ((int) color >>> 24);
-    view.setBorderColor(SPACING_TYPES[index], rgbComponent, alphaComponent);
+  public void setBorderColor(ReactViewGroup view, int index, @Nullable Integer color) {
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.setBorderColor(
+          view, LogicalEdge.fromSpacingType(SPACING_TYPES[index]), color);
+    } else {
+      view.setBorderColor(SPACING_TYPES[index], color);
+    }
   }
 
   @ReactProp(name = ViewProps.COLLAPSABLE)
@@ -340,19 +385,35 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
   }
 
   @Override
-  public void setOpacity(@NonNull ReactViewGroup view, float opacity) {
+  public void setOpacity(ReactViewGroup view, float opacity) {
     view.setOpacityIfPossible(opacity);
   }
 
   @Override
   protected void setTransformProperty(
-      @NonNull ReactViewGroup view,
+      ReactViewGroup view,
       @Nullable ReadableArray transforms,
       @Nullable ReadableArray transformOrigin) {
     super.setTransformProperty(view, transforms, transformOrigin);
     view.setBackfaceVisibilityDependantOpacity();
   }
 
+  @ReactProp(name = ViewProps.BOX_SHADOW, customType = "BoxShadow")
+  public void setBoxShadow(ReactViewGroup view, @Nullable ReadableArray shadows) {
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.setBoxShadow(view, shadows);
+    }
+  }
+
+  @Override
+  public void setBackgroundColor(ReactViewGroup view, @ColorInt int backgroundColor) {
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.setBackgroundColor(view, backgroundColor);
+    } else {
+      super.setBackgroundColor(view, backgroundColor);
+    }
+  }
+
   @Override
   public String getName() {
     return REACT_CLASS;
@@ -447,7 +508,7 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
     }
     root.setFocusDestinations(fd);
   }
-
+  
   /**
    * Utility function to help capture Android TV/ Fire TV Devices with Touch Support
    */

package/ReactAndroid/src/main/java/com/facebook/react/views/view/WindowUtil.kt

@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react.views.view
+
+import android.os.Build
+import android.view.Window
+import android.view.WindowManager
+import androidx.core.view.ViewCompat
+
+@Suppress("DEPRECATION")
+public fun Window.setStatusBarTranslucency(isTranslucent: Boolean) {
+  // If the status bar is translucent hook into the window insets calculations
+  // and consume all the top insets so no padding will be added under the status bar.
+  if (isTranslucent) {
+    decorView.setOnApplyWindowInsetsListener { v, insets ->
+      val defaultInsets = v.onApplyWindowInsets(insets)
+      defaultInsets.replaceSystemWindowInsets(
+          defaultInsets.systemWindowInsetLeft,
+          0,
+          defaultInsets.systemWindowInsetRight,
+          defaultInsets.systemWindowInsetBottom)
+    }
+  } else {
+    decorView.setOnApplyWindowInsetsListener(null)
+  }
+  ViewCompat.requestApplyInsets(decorView)
+}
+
+public fun Window.setStatusBarVisibility(isHidden: Boolean) {
+  if (isHidden) {
+    this.statusBarHide()
+  } else {
+    this.statusBarShow()
+  }
+}
+
+@Suppress("DEPRECATION")
+private fun Window.statusBarHide() {
+  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+    // Ensure the content extends into the cutout area
+    attributes.layoutInDisplayCutoutMode =
+        WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+    setDecorFitsSystemWindows(false)
+  }
+  addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+  clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN)
+}
+
+@Suppress("DEPRECATION")
+private fun Window.statusBarShow() {
+  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+    attributes.layoutInDisplayCutoutMode =
+        WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT
+    setDecorFitsSystemWindows(true)
+  }
+  addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN)
+  clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+}

package/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.kt

@@ -8,6 +8,7 @@
 package com.facebook.systrace
 
 import androidx.tracing.Trace
+import kotlin.text.StringBuilder
 
 /**
  * Systrace stub that mostly does nothing but delegates to Trace for beginning/ending sections. The
@@ -35,6 +36,28 @@ public object Systrace {
     Trace.beginSection(sectionName)
   }
 
+  @JvmStatic
+  public fun beginSection(tag: Long, sectionName: String, args: Array<String>, argsLength: Int) {
+    Trace.beginSection(sectionName + "|" + convertArgsToText(args, argsLength))
+  }
+
+  private fun convertArgsToText(args: Array<String>, argsLength: Int): String {
+    val argsText: StringBuilder = StringBuilder()
+    var ii = 1
+    while (ii < argsLength) {
+      val key = args[ii - 1]
+      val value = args[ii]
+      argsText.append(key)
+      argsText.append('=')
+      argsText.append(value)
+      if (ii < argsLength - 1) {
+        argsText.append(';')
+      }
+      ii += 2
+    }
+    return argsText.toString()
+  }
+
   @JvmStatic
   public fun endSection(tag: Long) {
     Trace.endSection()

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.java

@@ -84,6 +84,7 @@ public class YogaNative {
   static native long jni_YGNodeStyleGetPositionJNI(long nativePointer, int edge);
   static native void jni_YGNodeStyleSetPositionJNI(long nativePointer, int edge, float position);
   static native void jni_YGNodeStyleSetPositionPercentJNI(long nativePointer, int edge, float percent);
+  static native void jni_YGNodeStyleSetPositionAutoJNI(long nativePointer, int edge);
   static native long jni_YGNodeStyleGetWidthJNI(long nativePointer);
   static native void jni_YGNodeStyleSetWidthJNI(long nativePointer, float width);
   static native void jni_YGNodeStyleSetWidthPercentJNI(long nativePointer, float percent);

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java

@@ -144,6 +144,8 @@ public abstract class YogaNode implements YogaProps {
 
   public abstract void setPositionPercent(YogaEdge edge, float percent);
 
+  public abstract void setPositionAuto(YogaEdge edge);
+
   public abstract YogaValue getWidth();
 
   public abstract void setWidth(float width);

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java

@@ -411,6 +411,10 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
     YogaNative.jni_YGNodeStyleSetPositionPercentJNI(mNativePointer, edge.intValue(), percent);
   }
 
+  public void setPositionAuto(YogaEdge edge) {
+    YogaNative.jni_YGNodeStyleSetPositionAutoJNI(mNativePointer, edge.intValue());
+  }
+
   public YogaValue getWidth() {
     return valueFromLong(YogaNative.jni_YGNodeStyleGetWidthJNI(mNativePointer));
   }

package/ReactAndroid/src/main/jni/CMakeLists.txt

@@ -22,7 +22,7 @@ endif(CCACHE_FOUND)
 
 # Make sure every shared lib includes a .note.gnu.build-id header
 add_link_options(-Wl,--build-id)
-add_compile_options(-Wall -Werror -std=c++20)
+add_compile_options(-Wall -Werror)
 
 function(add_react_android_subdir relative_path)
   add_subdirectory(${REACT_ANDROID_DIR}/${relative_path} ReactAndroid/${relative_path})
@@ -99,6 +99,7 @@ add_react_common_subdir(react/renderer/components/text)
 add_react_common_subdir(react/renderer/components/unimplementedview)
 add_react_common_subdir(react/renderer/components/modal)
 add_react_common_subdir(react/renderer/components/scrollview)
+add_react_common_subdir(react/renderer/components/safeareaview)
 add_react_common_subdir(react/renderer/leakchecker)
 add_react_common_subdir(react/renderer/observers/events)
 add_react_common_subdir(react/renderer/textlayoutmanager)
@@ -115,15 +116,18 @@ add_react_common_subdir(jserrorhandler)
 add_react_common_subdir(react/runtime)
 add_react_common_subdir(react/runtime/hermes)
 add_react_common_subdir(react/runtime/nativeviewconfig)
+add_react_common_subdir(react/timing)
 
 # ReactAndroid JNI targets
 add_react_build_subdir(generated/source/codegen/jni)
 add_react_android_subdir(src/main/jni/first-party/fb)
 add_react_android_subdir(src/main/jni/first-party/fbgloginit)
 add_react_android_subdir(src/main/jni/first-party/yogajni)
+add_react_android_subdir(src/main/jni/first-party/jni-lib-merge)
 add_react_android_subdir(src/main/jni/react/jni)
 add_react_android_subdir(src/main/jni/react/reactperflogger)
 add_react_android_subdir(src/main/jni/react/jscexecutor)
+add_react_android_subdir(src/main/jni/react/jsctooling)
 add_react_android_subdir(src/main/jni/react/turbomodule)
 add_react_android_subdir(src/main/jni/react/uimanager)
 add_react_android_subdir(src/main/jni/react/mapbuffer)
@@ -132,6 +136,7 @@ add_react_android_subdir(src/main/jni/react/fabric)
 add_react_android_subdir(src/main/jni/react/featureflags)
 add_react_android_subdir(src/main/jni/react/newarchdefaults)
 add_react_android_subdir(src/main/jni/react/hermes/reactexecutor)
+add_react_android_subdir(src/main/jni/react/hermes/tooling)
 add_react_android_subdir(src/main/jni/react/hermes/instrumentation/)
 add_react_android_subdir(src/main/jni/react/runtime/cxxreactpackage)
 add_react_android_subdir(src/main/jni/react/runtime/jni)
@@ -139,6 +144,170 @@ add_react_android_subdir(src/main/jni/react/runtime/hermes/jni)
 add_react_android_subdir(src/main/jni/react/runtime/jsc/jni)
 add_react_android_subdir(src/main/jni/react/devsupport)
 
+# SoMerging Utils
+include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)
+
+# libreactnative.so Dependency
+#
+# The React Native Android Library (the .aar) should expose headers only via this target.
+# This is needed in order to reduce the number of .so files that we ship in the final library
+add_library(reactnative
+        SHARED
+          $<TARGET_OBJECTS:bridgeless>
+          $<TARGET_OBJECTS:bridgelessnativeviewconfig>
+          $<TARGET_OBJECTS:callinvokerholder>
+          $<TARGET_OBJECTS:fabricjni>
+          $<TARGET_OBJECTS:glog_init>
+          $<TARGET_OBJECTS:jni_lib_merge_glue>
+          $<TARGET_OBJECTS:jserrorhandler>
+          $<TARGET_OBJECTS:jsinspector>
+          $<TARGET_OBJECTS:jsireact>
+          $<TARGET_OBJECTS:logger>
+          $<TARGET_OBJECTS:mapbufferjni>
+          $<TARGET_OBJECTS:react_bridging>
+          $<TARGET_OBJECTS:react_codegen_rncore>
+          $<TARGET_OBJECTS:react_config>
+          $<TARGET_OBJECTS:react_cxxreact>
+          $<TARGET_OBJECTS:react_debug>
+          $<TARGET_OBJECTS:react_devsupportjni>
+          $<TARGET_OBJECTS:react_featureflags>
+          $<TARGET_OBJECTS:react_featureflagsjni>
+          $<TARGET_OBJECTS:react_nativemodule_core>
+          $<TARGET_OBJECTS:react_nativemodule_defaults>
+          $<TARGET_OBJECTS:react_nativemodule_dom>
+          $<TARGET_OBJECTS:react_nativemodule_featureflags>
+          $<TARGET_OBJECTS:react_nativemodule_idlecallbacks>
+          $<TARGET_OBJECTS:react_nativemodule_microtasks>
+          $<TARGET_OBJECTS:react_newarchdefaults>
+          $<TARGET_OBJECTS:react_performance_timeline>
+          $<TARGET_OBJECTS:react_render_animations>
+          $<TARGET_OBJECTS:react_render_attributedstring>
+          $<TARGET_OBJECTS:react_render_componentregistry>
+          $<TARGET_OBJECTS:react_render_consistency>
+          $<TARGET_OBJECTS:react_render_core>
+          $<TARGET_OBJECTS:react_render_debug>
+          $<TARGET_OBJECTS:react_render_dom>
+          $<TARGET_OBJECTS:react_render_element>
+          $<TARGET_OBJECTS:react_render_graphics>
+          $<TARGET_OBJECTS:react_render_imagemanager>
+          $<TARGET_OBJECTS:react_render_leakchecker>
+          $<TARGET_OBJECTS:react_render_mapbuffer>
+          $<TARGET_OBJECTS:react_render_mounting>
+          $<TARGET_OBJECTS:react_render_observers_events>
+          $<TARGET_OBJECTS:react_render_runtimescheduler>
+          $<TARGET_OBJECTS:react_render_scheduler>
+          $<TARGET_OBJECTS:react_render_telemetry>
+          $<TARGET_OBJECTS:react_render_textlayoutmanager>
+          $<TARGET_OBJECTS:react_render_uimanager>
+          $<TARGET_OBJECTS:react_render_uimanager_consistency>
+          $<TARGET_OBJECTS:react_utils>
+          $<TARGET_OBJECTS:reactnativeblob>
+          $<TARGET_OBJECTS:reactnativejni>
+          $<TARGET_OBJECTS:reactperflogger>
+          $<TARGET_OBJECTS:rninstance>
+          $<TARGET_OBJECTS:rrc_image>
+          $<TARGET_OBJECTS:rrc_legacyviewmanagerinterop>
+          $<TARGET_OBJECTS:rrc_modal>
+          $<TARGET_OBJECTS:rrc_native>
+          $<TARGET_OBJECTS:rrc_progressbar>
+          $<TARGET_OBJECTS:rrc_root>
+          $<TARGET_OBJECTS:rrc_safeareaview>
+          $<TARGET_OBJECTS:rrc_scrollview>
+          $<TARGET_OBJECTS:rrc_switch>
+          $<TARGET_OBJECTS:rrc_text>
+          $<TARGET_OBJECTS:rrc_textinput>
+          $<TARGET_OBJECTS:rrc_view>
+          $<TARGET_OBJECTS:runtimeexecutor>
+          $<TARGET_OBJECTS:turbomodulejsijni>
+          $<TARGET_OBJECTS:uimanagerjni>
+          $<TARGET_OBJECTS:yoga>
+)
+target_merge_so(reactnative)
+
+target_link_libraries(reactnative
+          PUBLIC
+            android
+            double-conversion
+            fb
+            fbjni
+            folly_runtime
+            glog
+            jsi
+            log
+            yogacore
+)
+
+target_include_directories(reactnative
+        PUBLIC
+        $<TARGET_PROPERTY:bridgeless,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:bridgelessnativeviewconfig,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:callinvokerholder,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:fabricjni,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:glog_init,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:jserrorhandler,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:jsinspector,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:jsireact,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:mapbufferjni,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_bridging,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_codegen_rncore,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_config,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_cxxreact,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_debug,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_devsupportjni,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_featureflags,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_featureflagsjni,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_nativemodule_core,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_nativemodule_defaults,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_nativemodule_dom,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_nativemodule_featureflags,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_nativemodule_idlecallbacks,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_nativemodule_microtasks,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_newarchdefaults,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_performance_timeline,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_animations,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_attributedstring,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_componentregistry,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_componentregistry,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_consistency,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_core,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_debug,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_dom,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_element,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_graphics,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_imagemanager,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_leakchecker,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_mapbuffer,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_mounting,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_observers_events,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_runtimescheduler,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_scheduler,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_telemetry,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_textlayoutmanager,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_uimanager,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_render_uimanager_consistency,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_utils,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:reactnativeblob,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:reactnativejni,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:reactperflogger,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:rninstance,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:rrc_image,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:rrc_legacyviewmanagerinterop,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:rrc_modal,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:rrc_native,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:rrc_progressbar,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:rrc_root,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:rrc_safeareaview,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:rrc_scrollview,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:rrc_switch,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:rrc_text,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:rrc_textinput,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:rrc_view,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:runtimeexecutor,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:turbomodulejsijni,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:uimanagerjni,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:yoga,INTERFACE_INCLUDE_DIRECTORIES>
+)
+
 # GTest dependencies
 add_executable(reactnative_unittest
   ${REACT_COMMON_DIR}/cxxreact/tests/jsarg_helpers.cpp
@@ -195,31 +364,41 @@ add_executable(reactnative_unittest
     -std=c++20
     -DHERMES_ENABLE_DEBUGGER)
 
-  target_link_libraries(reactnative_unittest
+target_link_libraries(reactnative_unittest
+  fabricjni
   folly_runtime
   glog
   glog_init
   gtest_main
   hermes-engine::libhermes
   hermes_inspector_modern
+  jserrorhandler
   jsi
-  react_cxxreact
+  mapbufferjni
   react_codegen_rncore
+  react_cxxreact
   react_debug
   react_render_animations
   react_render_attributedstring
   react_render_core
   react_render_debug
+  react_render_dom
   react_render_element
   react_render_graphics
   react_render_mapbuffer
   react_render_mounting
+  react_render_telemetry
   react_render_textlayoutmanager
   react_render_uimanager
+  react_render_uimanager_consistency
   react_utils
+  reactnative
+  rrc_legacyviewmanagerinterop
   rrc_modal
+  rrc_root
   rrc_scrollview
   rrc_text
+  rrc_textinput
   rrc_view
   yoga
 )

package/ReactAndroid/src/main/jni/first-party/fbgloginit/CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 add_compile_options(-fexceptions -fno-omit-frame-pointer)
 
-add_library(glog_init STATIC glog_init.cpp)
+add_library(glog_init OBJECT glog_init.cpp)
 
 target_include_directories(glog_init PUBLIC .)
 

package/ReactAndroid/src/main/jni/first-party/jni-lib-merge/CMakeLists.txt

@@ -0,0 +1,24 @@
+# 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)
+
+# This is the 'glue' library responsible of allowing to do so-merging in React Native
+# OSS. This library contains just a .c file that is included in every merged library.
+#
+# The header file is included in every merged library during compilation and takes care
+# of the redefinition of the JNI_OnLoad function to JNI_OnLoad_Weak.
+#
+# More on this mechanism: https://github.com/fbsamples/android-native-library-merging-demo
+
+add_library(jni_lib_merge_glue OBJECT jni_lib_merge.c)
+
+add_compile_options(-fexceptions -Wall)
+add_definitions(-DJNI_MERGE_PRINT_ONLOAD)
+
+target_include_directories(jni_lib_merge_glue PUBLIC jni-lib-merge)
+
+target_link_libraries(jni_lib_merge_glue PUBLIC log)

package/ReactAndroid/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake

@@ -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)
+
+# This function should be invoked if the requested library is going to be merged
+# with libreactnative.so as such:
+#
+# target_merge_so(react_newarchdefaults)
+#
+# This function will take care of forcefully including the jni_lib_merge.h header that takes
+# care of redefining the JNI_OnLoad function to JNI_OnLoad_Weak.
+function(target_merge_so target_name)
+  target_compile_options(${target_name}
+          PRIVATE
+            -DORIGINAL_SONAME=\"lib${target_name}.so\"
+            -include ${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/jni_lib_merge.h
+  )
+  target_link_options(${target_name} PRIVATE -Wl,--defsym=JNI_OnLoad=JNI_OnLoad_Weak)
+endfunction()