From c726c27537d5fe81f3eeeef9a181888fcf1bb2c1 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Thu, 6 Nov 2025 00:51:16 -0800 Subject: [PATCH] Remove CxxModule support from CatalystInstance (#54269) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/54269 Changelog: [General][Breaking] Remove CxxModule support from CatalystInstance Reviewed By: javache Differential Revision: D85458376 fbshipit-source-id: 11fa38b5058e5654d3d6e1eda3bc2ceaba0c91ec --- .../facebook/react/bridge/CatalystInstanceImpl.java | 8 ++------ .../src/main/jni/react/jni/CatalystInstanceImpl.cpp | 10 +++------- .../src/main/jni/react/jni/CatalystInstanceImpl.h | 5 +---- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java index 6a15edf6770..f3e799d1417 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java @@ -157,7 +157,6 @@ public class CatalystInstanceImpl implements CatalystInstance { mReactQueueConfiguration.getJSQueueThread(), mNativeModulesQueueThread, mNativeModuleRegistry.getJavaModules(this), - mNativeModuleRegistry.getCxxModules(), mInspectorTarget); FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge"); Systrace.endSection(TRACE_TAG_REACT); @@ -212,13 +211,11 @@ public class CatalystInstanceImpl implements CatalystInstance { // Extend the Java-visible registry of modules mNativeModuleRegistry.registerModules(modules); Collection javaModules = modules.getJavaModules(this); - Collection cxxModules = modules.getCxxModules(); // Extend the Cxx-visible registry of modules wrapped in appropriate interfaces - jniExtendNativeModules(javaModules, cxxModules); + jniExtendNativeModules(javaModules); } - private native void jniExtendNativeModules( - Collection javaModules, Collection cxxModules); + private native void jniExtendNativeModules(Collection javaModules); private native void initializeBridge( InstanceCallback callback, @@ -226,7 +223,6 @@ public class CatalystInstanceImpl implements CatalystInstance { MessageQueueThread jsQueue, MessageQueueThread moduleQueue, Collection javaModules, - Collection cxxModules, @Nullable ReactInstanceManagerInspectorTarget inspectorTarget); @Override diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp index cc618247533..4bf4824d88b 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp @@ -164,8 +164,6 @@ void CatalystInstanceImpl::initializeBridge( jni::alias_ref nativeModulesQueue, jni::alias_ref::javaobject> javaModules, - jni::alias_ref::javaobject> - cxxModules, jni::alias_ref inspectorTarget) { set_react_native_logfunc(&log); @@ -196,7 +194,7 @@ void CatalystInstanceImpl::initializeBridge( moduleRegistry_ = std::make_shared(buildNativeModuleList( std::weak_ptr(instance_), javaModules, - cxxModules, + {}, moduleMessageQueue_)); instance_->initializeBridge( @@ -211,13 +209,11 @@ void CatalystInstanceImpl::initializeBridge( void CatalystInstanceImpl::extendNativeModules( jni::alias_ref::javaobject> - javaModules, - jni::alias_ref::javaobject> - cxxModules) { + javaModules) { moduleRegistry_->registerModules(buildNativeModuleList( std::weak_ptr(instance_), javaModules, - cxxModules, + {}, moduleMessageQueue_)); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h index 2993161ac7a..1e302b1b707 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h @@ -60,12 +60,9 @@ class [[deprecated("This API will be removed along with the legacy architecture. jni::alias_ref jsQueue, jni::alias_ref nativeModulesQueue, jni::alias_ref::javaobject> javaModules, - jni::alias_ref::javaobject> cxxModules, jni::alias_ref inspectorTarget); - void extendNativeModules( - jni::alias_ref::javaobject> javaModules, - jni::alias_ref::javaobject> cxxModules); + void extendNativeModules(jni::alias_ref::javaobject> javaModules); /** * Sets the source URL of the underlying bridge without loading any JS code.