diff --git a/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp b/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp index 56a38374370..e6659fe53a8 100644 --- a/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #ifdef REACT_NATIVE_APP_CODEGEN_HEADER #include REACT_NATIVE_APP_CODEGEN_HEADER @@ -95,8 +96,17 @@ std::shared_ptr javaModuleProvider( } #endif + // We first try to look up core modules + if (auto module = rncore_ModuleProvider(name, params)) { + return module; + } + // And we fallback to the module providers autolinked by RN CLI - return rncli_ModuleProvider(name, params); + if (auto module = rncli_ModuleProvider(name, params)) { + return module; + } + + return nullptr; } } // namespace facebook::react diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp index f7547b1f801..34a98d5483b 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp @@ -12,7 +12,6 @@ #include #include #include -#include namespace facebook::react { @@ -100,7 +99,8 @@ std::shared_ptr DefaultTurboModuleManagerDelegate::getTurboModule( return resolvedModule; } } - return rncore_ModuleProvider(name, params); + + return nullptr; } } // namespace facebook::react diff --git a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp index 7ba52751e28..927ab744ca7 100644 --- a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp +++ b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #ifdef REACT_NATIVE_APP_CODEGEN_HEADER #include REACT_NATIVE_APP_CODEGEN_HEADER @@ -51,6 +52,12 @@ std::shared_ptr javaModuleProvider( return module; } #endif + + // We first try to look up core modules + if (auto module = rncore_ModuleProvider(name, params)) { + return module; + } + return nullptr; }