react-native 0.68.1 → 0.69.0-rc.0

package/ReactAndroid/src/main/jni/third-party/fmt/CMakeLists.txt

@@ -0,0 +1,13 @@
+# 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(-std=c++11 -fexceptions)
+
+add_library(fmt STATIC src/format.cc)
+
+target_include_directories(fmt PUBLIC include)

package/ReactAndroid/src/main/jni/third-party/folly/Android.mk

@@ -1,7 +1,28 @@
 LOCAL_PATH:= $(call my-dir)
+
+FOLLY_FLAGS := \
+  -DFOLLY_NO_CONFIG=1 \
+  -DFOLLY_HAVE_CLOCK_GETTIME=1 \
+  -DFOLLY_USE_LIBCPP=1 \
+  -DFOLLY_MOBILE=1 \
+  -DFOLLY_HAVE_RECVMMSG=1 \
+  -DFOLLY_HAVE_PTHREAD=1
+
+# If APP_PLATFORM in Application.mk targets android-23 above, please comment this line.
+# NDK uses GNU style stderror_r() after API 23.
+FOLLY_FLAGS += -DFOLLY_HAVE_XSI_STRERROR_R=1
+
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES:= \
+LOCAL_SRC_FILES := \
+  folly/SharedMutex.cpp \
+  folly/concurrency/CacheLocality.cpp \
+  folly/detail/Futex.cpp \
+  folly/lang/SafeAssert.cpp \
+  folly/lang/ToAscii.cpp \
+  folly/synchronization/ParkingLot.cpp \
+  folly/system/ThreadId.cpp \
+  folly/system/ThreadName.cpp \
   folly/json.cpp \
   folly/Unicode.cpp \
   folly/Conv.cpp \
@@ -14,13 +35,11 @@ LOCAL_SRC_FILES:= \
   folly/net/NetOps.cpp \
   folly/json_pointer.cpp \
   folly/lang/CString.cpp \
-  folly/lang/SafeAssert.cpp \
   folly/detail/UniqueInstance.cpp \
   folly/hash/SpookyHashV2.cpp \
   folly/container/detail/F14Table.cpp \
   folly/ScopeGuard.cpp \
-  folly/portability/SysUio.cpp \
-  folly/lang/ToAscii.cpp
+  folly/portability/SysUio.cpp
 
 ifeq ($(APP_OPTIM),debug)
   LOCAL_SRC_FILES += \
@@ -30,28 +49,14 @@ endif
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare
-
-FOLLY_FLAGS := \
-  -DFOLLY_NO_CONFIG=1 \
-  -DFOLLY_HAVE_CLOCK_GETTIME=1 \
-  -DFOLLY_USE_LIBCPP=1 \
-  -DFOLLY_MOBILE=1 \
-  -DFOLLY_HAVE_RECVMMSG=1 \
-  -DFOLLY_HAVE_PTHREAD=1
-
-# If APP_PLATFORM in Application.mk targets android-23 above, please comment this line.
-# NDK uses GNU style stderror_r() after API 23.
-FOLLY_FLAGS += -DFOLLY_HAVE_XSI_STRERROR_R=1
-
+LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -Wno-unused-variable
 LOCAL_CFLAGS += $(FOLLY_FLAGS)
-
 LOCAL_EXPORT_CPPFLAGS := $(FOLLY_FLAGS)
 
-LOCAL_MODULE := libfolly_json
+LOCAL_MODULE := folly_runtime
 
-LOCAL_SHARED_LIBRARIES := libglog libdouble-conversion
-LOCAL_STATIC_LIBRARIES := libboost libfmt
+LOCAL_SHARED_LIBRARIES := libglog
+LOCAL_STATIC_LIBRARIES := libboost libfmt libdouble-conversion
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -61,13 +66,11 @@ LOCAL_SRC_FILES := \
   folly/ExceptionWrapper.cpp \
   folly/ExceptionString.cpp \
   folly/Executor.cpp \
-  folly/SharedMutex.cpp \
   folly/Singleton.cpp \
   folly/Try.cpp \
   folly/concurrency/CacheLocality.cpp \
   folly/detail/AsyncTrace.cpp \
   folly/detail/AtFork.cpp \
-  folly/detail/Futex.cpp \
   folly/detail/MemoryIdler.cpp \
   folly/detail/SingletonStackTrace.cpp \
   folly/detail/StaticSingletonManager.cpp \
@@ -97,12 +100,9 @@ LOCAL_SRC_FILES := \
   folly/portability/SysMembarrier.cpp \
   folly/synchronization/AsymmetricMemoryBarrier.cpp \
   folly/synchronization/Hazptr.cpp \
-  folly/synchronization/ParkingLot.cpp \
   folly/synchronization/WaitOptions.cpp \
   folly/synchronization/detail/Sleeper.cpp \
-  folly/system/Pid.cpp \
-  folly/system/ThreadId.cpp \
-  folly/system/ThreadName.cpp
+  folly/system/Pid.cpp
 
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
@@ -116,10 +116,10 @@ LOCAL_EXPORT_CPPFLAGS := $(FOLLY_FLAGS)
 
 LOCAL_MODULE := libfolly_futures
 
-LOCAL_SHARED_LIBRARIES := libglog libdouble-conversion libfolly_json
-LOCAL_STATIC_LIBRARIES := libboost libevent libfmt
+LOCAL_SHARED_LIBRARIES := libglog libfolly_runtime
+LOCAL_STATIC_LIBRARIES := libboost libevent libfmt libdouble-conversion
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
 
 $(call import-module,libevent)
 $(call import-module,glog)

package/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt

@@ -0,0 +1,126 @@
+# 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)
+
+SET(folly_FLAGS
+        -DFOLLY_NO_CONFIG=1
+        -DFOLLY_HAVE_CLOCK_GETTIME=1
+        -DFOLLY_USE_LIBCPP=1
+        -DFOLLY_MOBILE=1
+        -DFOLLY_HAVE_RECVMMSG=1
+        -DFOLLY_HAVE_PTHREAD=1
+        # If APP_PLATFORM in Application.mk targets android-23 above, please comment
+        # the following line. NDK uses GNU style stderror_r() after API 23.
+        -DFOLLY_HAVE_XSI_STRERROR_R=1
+        )
+
+##################
+### folly_runtime ###
+##################
+
+SET(folly_runtime_SRC
+        folly/SharedMutex.cpp
+        folly/concurrency/CacheLocality.cpp
+        folly/detail/Futex.cpp
+        folly/lang/SafeAssert.cpp
+        folly/lang/ToAscii.cpp
+        folly/synchronization/ParkingLot.cpp
+        folly/system/ThreadId.cpp
+        folly/system/ThreadName.cpp
+        folly/json.cpp
+        folly/Unicode.cpp
+        folly/Conv.cpp
+        folly/Demangle.cpp
+        folly/memory/detail/MallocImpl.cpp
+        folly/String.cpp
+        folly/dynamic.cpp
+        folly/FileUtil.cpp
+        folly/Format.cpp
+        folly/net/NetOps.cpp
+        folly/json_pointer.cpp
+        folly/lang/CString.cpp
+        folly/detail/UniqueInstance.cpp
+        folly/hash/SpookyHashV2.cpp
+        folly/container/detail/F14Table.cpp
+        folly/ScopeGuard.cpp
+        folly/portability/SysUio.cpp)
+
+IF (CMAKE_BUILD_TYPE MATCHES Debug)
+  list(APPEND folly_runtime_SRC folly/lang/Assume.cpp)
+ENDIF ()
+
+add_library(folly_runtime SHARED ${folly_runtime_SRC})
+
+target_compile_options(folly_runtime
+        PRIVATE
+        -fexceptions
+        -fno-omit-frame-pointer
+        -frtti
+        -Wno-sign-compare
+        ${folly_FLAGS})
+
+target_compile_options(folly_runtime PUBLIC ${folly_FLAGS})
+
+target_include_directories(folly_runtime PUBLIC .)
+target_link_libraries(folly_runtime glog double-conversion boost fmt)
+
+#####################
+### folly_futures ###
+#####################
+
+add_library(folly_futures STATIC
+        folly/ExceptionWrapper.cpp
+        folly/ExceptionString.cpp
+        folly/Executor.cpp
+        folly/Singleton.cpp
+        folly/Try.cpp
+        folly/concurrency/CacheLocality.cpp
+        folly/detail/AsyncTrace.cpp
+        folly/detail/AtFork.cpp
+        folly/detail/MemoryIdler.cpp
+        folly/detail/SingletonStackTrace.cpp
+        folly/detail/StaticSingletonManager.cpp
+        folly/detail/ThreadLocalDetail.cpp
+        folly/fibers/Baton.cpp
+        folly/fibers/FiberManager.cpp
+        folly/fibers/Fiber.cpp
+        folly/fibers/GuardPageAllocator.cpp
+        folly/futures/detail/Core.cpp
+        folly/futures/Future.cpp
+        folly/futures/ThreadWheelTimekeeper.cpp
+        folly/executors/ExecutorWithPriority.cpp
+        folly/executors/InlineExecutor.cpp
+        folly/executors/TimedDrivableExecutor.cpp
+        folly/executors/QueuedImmediateExecutor.cpp
+        folly/io/async/AsyncTimeout.cpp
+        folly/io/async/EventBase.cpp
+        folly/io/async/EventBaseBackendBase.cpp
+        folly/io/async/EventBaseLocal.cpp
+        folly/io/async/EventHandler.cpp
+        folly/io/async/HHWheelTimer.cpp
+        folly/io/async/Request.cpp
+        folly/io/async/TimeoutManager.cpp
+        folly/io/async/VirtualEventBase.cpp
+        folly/lang/Exception.cpp
+        folly/memory/MallctlHelper.cpp
+        folly/portability/SysMembarrier.cpp
+        folly/synchronization/AsymmetricMemoryBarrier.cpp
+        folly/synchronization/Hazptr.cpp
+        folly/synchronization/WaitOptions.cpp
+        folly/synchronization/detail/Sleeper.cpp
+        folly/system/Pid.cpp)
+
+target_compile_options(folly_futures
+        PRIVATE
+        -fexceptions
+        -fno-omit-frame-pointer
+        -frtti
+        -Wno-sign-compare
+        -Wno-unused-variable)
+
+target_include_directories(folly_futures PUBLIC .)
+target_link_libraries(folly_futures glog double-conversion folly_runtime boost event fmt)

package/ReactAndroid/src/main/jni/third-party/glog/CMakeLists.txt

@@ -0,0 +1,35 @@
+# 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(
+        -Wwrite-strings
+        -Woverloaded-virtual
+        -Wno-sign-compare
+        -DNDEBUG
+        -g
+        -O2
+        -DHAVE_PREAD=1
+)
+
+add_library(glog
+        SHARED
+        glog-0.3.5/src/demangle.cc
+        glog-0.3.5/src/logging.cc
+        glog-0.3.5/src/raw_logging.cc
+        glog-0.3.5/src/signalhandler.cc
+        glog-0.3.5/src/symbolize.cc
+        glog-0.3.5/src/utilities.cc
+        glog-0.3.5/src/vlog_is_on.cc
+        )
+
+# For private compilation, we include all the headers.
+# config.h is also there.
+target_include_directories(glog PRIVATE .)
+# For consumer, we set the `exported` dir as the
+# include folder.
+target_include_directories(glog PUBLIC exported)

package/ReactAndroid/src/main/jni/third-party/jsc/CMakeLists.txt

@@ -0,0 +1,15 @@
+# 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_library(jsc SHARED IMPORTED GLOBAL)
+set_target_properties(jsc
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${CMAKE_CURRENT_SOURCE_DIR}/jni/${ANDROID_ABI}/libjsc.so)
+
+target_include_directories(jsc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

package/ReactAndroid/src/main/jni/third-party/libevent/CMakeLists.txt

@@ -0,0 +1,42 @@
+# 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(
+        -DNDEBUG
+        -O2
+        -Wno-unused-function
+        -Wno-unneeded-internal-declaration
+        -std=c11)
+
+add_library(event
+        STATIC
+        event.c
+        buffer.c
+        bufferevent.c
+        bufferevent_filter.c
+        bufferevent_pair.c
+        bufferevent_ratelim.c
+        bufferevent_sock.c
+        epoll.c
+        evmap.c
+        evthread.c
+        evthread_pthread.c
+        evutil.c
+        evutil_rand.c
+        evutil_time.c
+        listener.c
+        log.c
+        poll.c
+        signal.c
+        strlcpy.c
+        select.c)
+
+target_include_directories(event PUBLIC include)
+
+# link against libc as well
+target_link_libraries(event c)

package/ReactAndroid/src/main/res/shell/values/styles.xml

@@ -19,11 +19,12 @@
         <item name="android:datePickerMode">spinner</item>
     </style>
 
-    <style name="CalendarDatePickerDialog" parent="Theme.AppCompat.Light.Dialog" tools:targetApi="lollipop">
+    <style name="CalendarDatePickerDialog" parent="android:Theme.Material.Dialog.Alert" tools:targetApi="lollipop">
         <item name="android:datePickerStyle">@style/CalendarDatePickerStyle</item>
+        <item name="android:windowIsFloating">true</item>
     </style>
 
-    <style name="CalendarDatePickerStyle" parent="android:Widget.Material.Light.DatePicker" tools:targetApi="lollipop">
+    <style name="CalendarDatePickerStyle" parent="android:Widget.Material.DatePicker" tools:targetApi="lollipop">
         <item name="android:datePickerMode">calendar</item>
     </style>
 

package/ReactAndroid/src/main/res/views/uimanager/values/ids.xml

@@ -27,6 +27,8 @@
   <!--tag is used to store accessibilityValue tag -->
   <item type="id" name="accessibility_value"/>
 
+  <!--tag is used to store accessibilityLinks tag -->
+  <item type="id" name="accessibility_links"/>
   <!--tag is used to store accessibilityLabelledBy tag -->
   <item type="id" name="labelled_by"/>
 
@@ -39,3 +41,4 @@
   <!-- tag is used to store if a view is subscribed to the pointermove event -->
   <item type="id" name="pointer_move"/>
 </resources>
+

package/ReactAndroid/src/test/java/com/facebook/react/ReactActivityDelegateTest.kt

@@ -0,0 +1,62 @@
+/*
+ * 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
+
+import android.os.Bundle
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class ReactActivityDelegateTest {
+
+  @Test
+  fun delegateWithConcurrentRoot_populatesInitialPropsCorrectly() {
+    val delegate =
+        object : ReactActivityDelegate(null, "test-delegate") {
+          override fun isConcurrentRootEnabled() = true
+          public val inspectLaunchOptions: Bundle?
+            get() = getLaunchOptions()
+        }
+
+    assertNotNull(delegate.inspectLaunchOptions)
+    assertTrue(delegate.inspectLaunchOptions!!.containsKey("concurrentRoot"))
+    assertTrue(delegate.inspectLaunchOptions!!.getBoolean("concurrentRoot"))
+  }
+
+  @Test
+  fun delegateWithoutConcurrentRoot_hasNullInitialProperties() {
+    val delegate =
+        object : ReactActivityDelegate(null, "test-delegate") {
+          override fun isConcurrentRootEnabled() = false
+          public val inspectLaunchOptions: Bundle?
+            get() = getLaunchOptions()
+        }
+
+    assertNull(delegate.inspectLaunchOptions)
+  }
+
+  @Test
+  fun delegateWithConcurrentRoot_composesInitialPropertiesCorrectly() {
+    val delegate =
+        object : ReactActivityDelegate(null, "test-delegate") {
+          override fun isConcurrentRootEnabled() = true
+          override fun getLaunchOptions(): Bundle =
+              Bundle().apply { putString("test-property", "test-value") }
+          public val inspectLaunchOptions: Bundle?
+            get() = getLaunchOptions()
+        }
+
+    assertNotNull(delegate.inspectLaunchOptions)
+    assertTrue(delegate.inspectLaunchOptions!!.containsKey("concurrentRoot"))
+    assertTrue(delegate.inspectLaunchOptions!!.getBoolean("concurrentRoot"))
+    assertTrue(delegate.inspectLaunchOptions!!.containsKey("test-property"))
+    assertEquals("test-value", delegate.inspectLaunchOptions!!.getString("test-property"))
+  }
+}

package/ReactAndroid/src/test/java/com/facebook/react/views/BUCK

@@ -2,9 +2,12 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r
 
 rn_robolectric_test(
     name = "views",
-    # TODO Disabled temporarily until Yoga linking is fixed t14964130
+    # TODO (T110934492): Disabled temporarily until tests are fixed
     # srcs = glob(['**/*.java']),
-    srcs = glob(["image/*.java"]),
+    srcs = glob([
+        "image/*.java",
+        "view/*.java",
+    ]),
     contacts = ["oncall+fbandroid_sheriff@xmail.facebook.com"],
     deps = [
         YOGA_TARGET,

package/ReactAndroid/src/test/java/com/facebook/react/views/view/ColorUtilTest.java

@@ -44,4 +44,13 @@ public class ColorUtilTest {
     assertEquals(PixelFormat.OPAQUE, ColorUtil.getOpacityFromColor(0xFF123456));
     assertEquals(PixelFormat.OPAQUE, ColorUtil.getOpacityFromColor(0xFFFFFFFF));
   }
+
+  @Test
+  public void testNormalize() {
+    assertEquals(0x800B1621, ColorUtil.normalize(11, 22, 33, 0.5));
+    assertEquals(0x00000000, ColorUtil.normalize(0, 0, 0, 0));
+    assertEquals(0xFFFFFFFF, ColorUtil.normalize(255, 255, 255, 1));
+    assertEquals(0xFF00FFFF, ColorUtil.normalize(-1, 256, 255, 1.1));
+    assertEquals(0x000001FF, ColorUtil.normalize(0.4, 0.5, 255.4, -1));
+  }
 }

package/ReactAndroid/src/test/resources/BUCK

@@ -7,6 +7,7 @@ java_library(
     name = "robolectric",
     srcs = [],
     labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
     resources = [

package/ReactCommon/React-Fabric.podspec

@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "11.0" }
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "dummyFile.cpp"
   s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",

package/ReactCommon/React-rncore.podspec

@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "11.0" }
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "dummyFile.cpp"
   s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",

package/ReactCommon/ReactCommon.podspec

@@ -28,17 +28,18 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "11.0" }
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.header_dir             = "ReactCommon" # Use global header_dir for all subspecs for use_frameworks! compatibility
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\"",
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Private/React-bridging\"",
                                "USE_HEADERMAP" => "YES",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" }
+                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
 
   # TODO (T48588859): Restructure this target to align with dir structure: "react/nativemodule/..."
   # Note: Update this only when ready to minimize breaking changes.
   s.subspec "turbomodule" do |ss|
+    ss.dependency "React-bridging", version
     ss.dependency "React-callinvoker", version
     ss.dependency "React-perflogger", version
     ss.dependency "React-Core", version

package/ReactCommon/butter/Android.mk

@@ -19,8 +19,6 @@ LOCAL_CFLAGS := \
 
 LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
-LOCAL_STATIC_LIBRARIES :=
-
 LOCAL_SHARED_LIBRARIES := glog
 
 include $(BUILD_SHARED_LIBRARY)

package/ReactCommon/butter/BUCK

@@ -32,7 +32,10 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

package/ReactCommon/butter/CMakeLists.txt

@@ -0,0 +1,20 @@
+# 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(
+        -DLOG_TAG=\"Butter\"
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall)
+
+add_library(butter INTERFACE)
+
+target_include_directories(butter INTERFACE .)
+
+target_link_libraries(butter INTERFACE glog)

package/ReactCommon/callinvoker/BUCK

@@ -10,7 +10,10 @@ rn_xplat_cxx_library(
         ],
         prefix = "ReactCommon",
     ),
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     platforms = (ANDROID, APPLE, CXX),
     preferred_linkage = "static",
     preprocessor_flags = [

package/ReactCommon/callinvoker/CMakeLists.txt

@@ -0,0 +1,13 @@
+# 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(-fexceptions -frtti -std=c++17 -Wall)
+
+add_library(callinvoker INTERFACE)
+
+target_include_directories(callinvoker INTERFACE .)

package/ReactCommon/callinvoker/React-callinvoker.podspec

@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "11.0" }
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.header_dir             = "ReactCommon"

package/ReactCommon/cxxreact/Android.mk

@@ -28,7 +28,7 @@ LOCAL_STATIC_LIBRARIES := \
 LOCAL_SHARED_LIBRARIES := \
   glog \
   jsinspector \
-  libfolly_json \
+  libfolly_runtime \
   libruntimeexecutor \
   logger
 
@@ -42,6 +42,9 @@ $(call import-module,jsc)
 $(call import-module,glog)
 $(call import-module,jsi)
 $(call import-module,jsinspector)
-$(call import-module,hermes/inspector)
 $(call import-module,hermes/executor)
 $(call import-module,logger)
+
+ifeq ($(APP_OPTIM),debug)
+  $(call import-module,hermes/inspector)
+endif