facebook · andrewdacenko · Jun 20, 2025 · Jun 20, 2025 · Jun 20, 2025 · Jun 20, 2025
diff --git a/packages/react-native/ReactCommon/cmake-utils/react-native-flags.cmake b/packages/react-native/ReactCommon/cmake-utils/react-native-flags.cmake
@@ -28,6 +28,8 @@ SET(reactnative_FLAGS
 
 function(target_compile_reactnative_options target_name scope)
   target_compile_options(${target_name} ${scope} ${reactnative_FLAGS})
-  target_compile_definitions(${target_name} ${scope} RN_SERIALIZABLE_STATE)
+  # TODO T228344694 improve this so that it works for all platforms
+  if(ANDROID)
+    target_compile_definitions(${target_name} ${scope} RN_SERIALIZABLE_STATE)
+  endif()
 endfunction()
-
diff --git a/packages/react-native/ReactCommon/devtoolsruntimesettings/CMakeLists.txt b/packages/react-native/ReactCommon/devtoolsruntimesettings/CMakeLists.txt
@@ -8,10 +8,10 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
 
-add_library(react_devtoolsruntimesettingscxx INTERFACE)
+file(GLOB devtoolsruntimesettings_SRCS *.cpp)
+add_library(devtoolsruntimesettings OBJECT ${devtoolsruntimesettings_SRCS})
 
-target_include_directories(react_devtoolsruntimesettingscxx INTERFACE .)
+target_include_directories(devtoolsruntimesettings PUBLIC .)
 
-target_link_libraries(react_devtoolsruntimesettingscxx jsi)
-target_compile_reactnative_options(react_devtoolsruntimesettingscxx PRIVATE)
-target_compile_options(react_devtoolsruntimesettingscxx PRIVATE -Wpedantic)
+target_link_libraries(devtoolsruntimesettings jsi react_codegen_rncore)
+target_compile_reactnative_options(devtoolsruntimesettings PRIVATE)
diff --git a/packages/react-native/ReactCommon/react/nativemodule/cputime/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/cputime/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)
+
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
+file(GLOB react_nativemodule_cpu_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_nativemodule_cpu OBJECT ${react_nativemodule_cpu_SRC})
+
+target_include_directories(react_nativemodule_cpu PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_nativemodule_cpu
+        react_codegen_rncore
+)
+target_compile_reactnative_options(react_nativemodule_cpu PRIVATE)
+target_compile_options(react_nativemodule_cpu PRIVATE -Wpedantic)
diff --git a/packages/react-native/ReactCommon/react/nativemodule/defaults/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/defaults/CMakeLists.txt
@@ -14,6 +14,8 @@ add_library(react_nativemodule_defaults OBJECT ${react_nativemodule_defaults_SRC
 target_include_directories(react_nativemodule_defaults PUBLIC ${REACT_COMMON_DIR})
 
 target_link_libraries(react_nativemodule_defaults
+        react_codegen_rncore
+        react_nativemodule_core
         react_nativemodule_dom
         react_nativemodule_devtoolsruntimesettings
         react_nativemodule_featureflags

diff --git a/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/CMakeLists.txt
@@ -14,7 +14,7 @@ add_library(react_nativemodule_devtoolsruntimesettings OBJECT ${react_nativemodu
 target_include_directories(react_nativemodule_devtoolsruntimesettings PUBLIC ${REACT_COMMON_DIR})
 
 target_link_libraries(react_nativemodule_devtoolsruntimesettings
-        react_devtoolsruntimesettingscxx
+        devtoolsruntimesettings
 )
 target_compile_reactnative_options(react_nativemodule_devtoolsruntimesettings PRIVATE)
 target_compile_options(react_nativemodule_devtoolsruntimesettings PRIVATE -Wpedantic)
diff --git a/.../ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.cpp b/.../ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.cpp
@@ -6,7 +6,9 @@
  */
 
 #include "DevToolsRuntimeSettingsModule.h"
+#if RN_DISABLE_OSS_PLUGIN_HEADER
 #include "Plugins.h"
+#endif
 
 std::shared_ptr<facebook::react::TurboModule>
 ReactDevToolsRuntimeSettingsModuleProvider(

diff --git a/...ve/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.h b/...ve/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "devtoolsruntimesettingscxx/DevToolsRuntimeSettings.h"
+#include <devtoolsruntimesettings/DevToolsRuntimeSettings.h>
 
 namespace facebook::react {
 

diff --git a/...ages/react-native/ReactCommon/react/nativemodule/fantomtestspecificmethods/CMakeLists.txt b/...ages/react-native/ReactCommon/react/nativemodule/fantomtestspecificmethods/CMakeLists.txt
@@ -0,0 +1,29 @@
+# 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)
+
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
+file(GLOB react_nativemodule_webperformance_SRC CONFIGURE_DEPENDS *.cpp internal/*.cpp)
+add_library(react_nativemodule_fantomspecificmethods OBJECT ${react_nativemodule_webperformance_SRC})
+
+target_include_directories(react_nativemodule_fantomspecificmethods PUBLIC ${REACT_COMMON_DIR})
+target_include_directories(react_nativemodule_fantomspecificmethods PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/internal)
+
+target_link_libraries(react_nativemodule_fantomspecificmethods
+        react_codegen_rncore
+        react_cxxreact
+        react_renderer_bridging
+        react_renderer_core
+        react_renderer_graphics
+        react_renderer_observers_intersection
+        react_renderer_runtimescheduler
+        react_renderer_uimanager
+        rrc_view
+)
+target_compile_reactnative_options(react_nativemodule_fantomspecificmethods PRIVATE)
+target_compile_options(react_nativemodule_fantomspecificmethods PRIVATE -Wpedantic -Wno-deprecated-declarations)
diff --git a/...ctCommon/react/nativemodule/fantomtestspecificmethods/NativeFantomTestSpecificMethods.cpp b/...ctCommon/react/nativemodule/fantomtestspecificmethods/NativeFantomTestSpecificMethods.cpp
@@ -11,7 +11,9 @@
 
 #include "internal/FantomForcedCloneCommitHook.h"
 
+#if RN_DISABLE_OSS_PLUGIN_HEADER
 #include "Plugins.h"
+#endif
 
 std::shared_ptr<facebook::react::TurboModule>
 NativeFantomTestSpecificMethodsModuleProvider(

diff --git a/packages/react-native/ReactCommon/react/nativemodule/intersectionobserver/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/intersectionobserver/CMakeLists.txt
@@ -0,0 +1,28 @@
+# 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)
+
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
+file(GLOB react_nativemodule_webperformance_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_nativemodule_intersectionobserver OBJECT ${react_nativemodule_webperformance_SRC})
+
+target_include_directories(react_nativemodule_intersectionobserver PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_nativemodule_intersectionobserver
+        react_codegen_rncore
+        react_cxxreact
+        react_renderer_bridging
+        react_renderer_core
+        react_renderer_graphics
+        react_renderer_observers_intersection
+        react_renderer_runtimescheduler
+        react_renderer_uimanager
+        rrc_view
+)
+target_compile_reactnative_options(react_nativemodule_intersectionobserver PRIVATE)
+target_compile_options(react_nativemodule_intersectionobserver PRIVATE -Wpedantic -Wno-deprecated-declarations)
diff --git a/...native/ReactCommon/react/nativemodule/intersectionobserver/NativeIntersectionObserver.cpp b/...native/ReactCommon/react/nativemodule/intersectionobserver/NativeIntersectionObserver.cpp
@@ -11,7 +11,9 @@
 #include <react/renderer/uimanager/UIManagerBinding.h>
 #include <react/renderer/uimanager/primitives.h>
 
+#ifdef RN_DISABLE_OSS_PLUGIN_HEADER
 #include "Plugins.h"
+#endif
 
 std::shared_ptr<facebook::react::TurboModule>
 NativeIntersectionObserverModuleProvider(

diff --git a/packages/react-native/ReactCommon/react/nativemodule/mutationobserver/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/mutationobserver/CMakeLists.txt
@@ -0,0 +1,27 @@
+# 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)
+
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
+file(GLOB react_nativemodule_webperformance_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_nativemodule_mutationobserver OBJECT ${react_nativemodule_webperformance_SRC})
+
+target_include_directories(react_nativemodule_mutationobserver PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_nativemodule_mutationobserver
+        react_codegen_rncore
+        react_renderer_bridging
+        react_renderer_core
+        react_renderer_uimanager
+        react_featureflags
+        react_renderer_observers_mutation
+        react_cxxreact
+        rrc_view
+)
+target_compile_reactnative_options(react_nativemodule_mutationobserver PRIVATE)
+target_compile_options(react_nativemodule_mutationobserver PRIVATE -Wpedantic)
diff --git a/...s/react-native/ReactCommon/react/nativemodule/mutationobserver/NativeMutationObserver.cpp b/...s/react-native/ReactCommon/react/nativemodule/mutationobserver/NativeMutationObserver.cpp
@@ -12,7 +12,9 @@
 #include <react/renderer/uimanager/UIManagerBinding.h>
 #include <react/renderer/uimanager/primitives.h>
 
+#ifdef RN_DISABLE_OSS_PLUGIN_HEADER
 #include "Plugins.h"
+#endif
 
 std::shared_ptr<facebook::react::TurboModule>
 NativeMutationObserverModuleProvider(

diff --git a/packages/react-native/ReactCommon/react/nativemodule/webperformance/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/webperformance/CMakeLists.txt
@@ -0,0 +1,21 @@
+# 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)
+
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
+file(GLOB react_nativemodule_webperformance_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_nativemodule_webperformance OBJECT ${react_nativemodule_webperformance_SRC})
+
+target_include_directories(react_nativemodule_webperformance PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_nativemodule_webperformance
+        react_codegen_rncore
+        react_cxxreact
+)
+target_compile_reactnative_options(react_nativemodule_webperformance PRIVATE)
+target_compile_options(react_nativemodule_webperformance PRIVATE -Wpedantic)
diff --git a/packages/react-native/ReactCommon/react/renderer/observers/intersection/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/observers/intersection/CMakeLists.txt
@@ -0,0 +1,28 @@
+# 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)
+
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
+file(GLOB react_nativemodule_webperformance_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_renderer_observers_intersection OBJECT ${react_nativemodule_webperformance_SRC})
+
+target_include_directories(react_renderer_observers_intersection PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_renderer_observers_intersection
+      react_cxxreact
+      react_bridging
+      react_debug
+      react_renderer_core
+      react_renderer_graphics
+      react_renderer_mounting
+      react_renderer_runtimescheduler
+      react_renderer_uimanager
+      rrc_view
+)
+target_compile_reactnative_options(react_renderer_observers_intersection PRIVATE)
+target_compile_options(react_renderer_observers_intersection PRIVATE -Wpedantic)
diff --git a/packages/react-native/ReactCommon/react/renderer/observers/mutation/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/observers/mutation/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)
+
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
+file(GLOB react_nativemodule_webperformance_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_renderer_observers_mutation OBJECT ${react_nativemodule_webperformance_SRC})
+
+target_include_directories(react_renderer_observers_mutation PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_renderer_observers_mutation
+      react_cxxreact
+      react_renderer_core
+      react_renderer_uimanager
+      react_renderer_mounting
+      react_bridging
+)
+target_compile_reactnative_options(react_renderer_observers_mutation PRIVATE)
+target_compile_options(react_renderer_observers_mutation PRIVATE -Wpedantic)
diff --git a/packages/react-native/ReactCxxPlatform/react/coremodules/CMakeLists.txt b/packages/react-native/ReactCxxPlatform/react/coremodules/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)
+
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
+file(GLOB react_cxx_platform_react_coremodules_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_cxx_platform_react_coremodules OBJECT ${react_cxx_platform_react_coremodules_SRC})
+
+target_include_directories(react_cxx_platform_react_coremodules PUBLIC ${REACT_CXX_PLATFORM_DIR})
+
+target_link_libraries(react_cxx_platform_react_coremodules
+      folly_runtime
+      jsi
+      react_nativemodule_core
+      react_codegen_rncore
+)
+target_compile_reactnative_options(react_cxx_platform_react_coremodules PRIVATE)
+target_compile_options(react_cxx_platform_react_coremodules PRIVATE -Wpedantic)
diff --git a/packages/react-native/ReactCxxPlatform/react/devsupport/CMakeLists.txt b/packages/react-native/ReactCxxPlatform/react/devsupport/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)
+
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
+file(GLOB react_cxx_platform_react_devsupport_SRC CONFIGURE_DEPENDS
+  *.cpp
+  inspector/*.cpp)
+add_library(react_cxx_platform_react_devsupport OBJECT ${react_cxx_platform_react_devsupport_SRC})
+
+target_include_directories(react_cxx_platform_react_devsupport PUBLIC ${REACT_CXX_PLATFORM_DIR})
+
+target_link_libraries(react_cxx_platform_react_devsupport
+      glog
+      nlohmann_json
+      folly_runtime
+      jsi
+      OpenSSL::Crypto
+      react_cxx_platform_react_http
+      react_cxx_platform_react_nativemodule
+      react_cxx_platform_react_renderer_scheduler
+      react_cxx_platform_react_renderer_scheduler
+      react_cxx_platform_react_threading
+      react_codegen_rncore
+      jsinspector
+      react_debug
+      react_renderer_graphics
+)
+target_compile_reactnative_options(react_cxx_platform_react_devsupport PRIVATE)
+target_compile_options(react_cxx_platform_react_devsupport PRIVATE -Wpedantic -Wno-deprecated-declarations)
diff --git a/packages/react-native/ReactCxxPlatform/react/http/CMakeLists.txt b/packages/react-native/ReactCxxPlatform/react/http/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)
+
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
+file(GLOB react_cxx_platform_react_http_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_cxx_platform_react_http OBJECT ${react_cxx_platform_react_http_SRC})
+
+target_include_directories(react_cxx_platform_react_http PUBLIC ${REACT_CXX_PLATFORM_DIR})
+
+target_link_libraries(react_cxx_platform_react_http
+      folly_runtime
+)
+target_compile_reactnative_options(react_cxx_platform_react_http PRIVATE)
+target_compile_options(react_cxx_platform_react_http PRIVATE -Wpedantic)
diff --git a/packages/react-native/ReactCxxPlatform/react/io/CMakeLists.txt b/packages/react-native/ReactCxxPlatform/react/io/CMakeLists.txt
@@ -0,0 +1,26 @@
+# 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)
+
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
+file(GLOB react_cxx_platform_react_io_SRC CONFIGURE_DEPENDS *.cpp platform/cxx/*.cpp)
+add_library(react_cxx_platform_react_io OBJECT ${react_cxx_platform_react_io_SRC})
+
+target_include_directories(react_cxx_platform_react_io PUBLIC ${REACT_CXX_PLATFORM_DIR})
+
+target_link_libraries(react_cxx_platform_react_io
+      glog
+      jsi
+      react_cxx_platform_react_nativemodule
+      react_cxx_platform_react_http
+      react_cxx_platform_react_threading
+      react_codegen_rncore
+      react_bridging
+)
+target_compile_reactnative_options(react_cxx_platform_react_io PRIVATE)
+target_compile_options(react_cxx_platform_react_io PRIVATE -Wpedantic)
diff --git a/packages/react-native/ReactCxxPlatform/react/io/platform/cxx/ResourceLoader.cpp b/packages/react-native/ReactCxxPlatform/react/io/platform/cxx/ResourceLoader.cpp
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "ResourceLoader.h"
+#include <react/io/ResourceLoader.h>
 
 #include <cassert>
 #include <fstream>