Provide easy regristration of C++ TurboModules in rn-tester Android (#…

…35225) Summary: Pull Request resolved: #35225 Changelog: [Android] [Changed] - Provide easy regristration of C++ TurboModules in rn-tester Android Differential Revision: D41069277 fbshipit-source-id: 06793c95b8d91d2acca0666d01cef376ffe0338d
facebook · Nov 6, 2022 · 152b53e · 152b53e
1 parent f0b7cbe
commit 152b53e
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp b/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp
@@ -65,13 +65,22 @@ std::shared_ptr<TurboModule> provideModules(
   return rncli_ModuleProvider(name, params);
 }
 
+std::shared_ptr<TurboModule> provideCxxModules(
+    const std::string &name,
+    const std::shared_ptr<CallInvoker> &jsInvoker) {
+  // Not implemented yet: provide pure-C++ NativeModules here.
+  return nullptr;
+}
+
 } // namespace react
 } // namespace facebook
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(vm, [] {
     facebook::react::DefaultTurboModuleManagerDelegate::
         moduleProvidersFromEntryPoint = &facebook::react::provideModules;
+    facebook::react::DefaultTurboModuleManagerDelegate::cxxModuleProviders =
+        &facebook::react::provideCxxModules;
     facebook::react::DefaultComponentsRegistry::
         registerComponentDescriptorsFromEntryPoint =
             &facebook::react::registerComponents;

diff --git a/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp b/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp
@@ -12,6 +12,12 @@
 namespace facebook {
 namespace react {
 
+std::function<std::shared_ptr<TurboModule>(
+    const std::string &,
+    const std::shared_ptr<CallInvoker> &)>
+    DefaultTurboModuleManagerDelegate::cxxModuleProvidersFromEntryPoint{
+        nullptr};
+
 std::function<std::shared_ptr<TurboModule>(
     const std::string &,
     const JavaTurboModule::InitParams &)>
@@ -32,7 +38,11 @@ void DefaultTurboModuleManagerDelegate::registerNatives() {
 std::shared_ptr<TurboModule> DefaultTurboModuleManagerDelegate::getTurboModule(
     const std::string &name,
     const std::shared_ptr<CallInvoker> &jsInvoker) {
-  // Not implemented yet: provide pure-C++ NativeModules here.
+  auto resolvedModule = (DefaultTurboModuleManagerDelegate::
+                             cxxModuleProvidersFromEntryPoint)(name, jsInvoker);
+  if (resolvedModule != nullptr) {
+    return resolvedModule;
+  }
   return nullptr;
 }
 

diff --git a/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h b/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h
@@ -27,6 +27,11 @@ class DefaultTurboModuleManagerDelegate : public jni::HybridClass<
 
   static void registerNatives();
 
+  static std::function<std::shared_ptr<TurboModule>(
+      const std::string &,
+      const std::shared_ptr<CallInvoker> &)>
+      cxxModuleProvidersFromEntryPoint;
+
   static std::function<std::shared_ptr<TurboModule>(
       const std::string &,
       const JavaTurboModule::InitParams &)>

diff --git a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp
@@ -37,11 +37,19 @@ std::shared_ptr<TurboModule> provideModules(
   return rncore_ModuleProvider(name, params);
 }
 
+std::shared_ptr<TurboModule> provideCxxModules(
+    const std::string &name,
+    const std::shared_ptr<CallInvoker> &jsInvoker) {
+  return nullptr;
+}
+
 } // namespace react
 } // namespace facebook
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(vm, [] {
+    facebook::react::DefaultTurboModuleManagerDelegate::
+        cxxModuleProvidersFromEntryPoint = &facebook::react::provideCxxModules;
     facebook::react::DefaultTurboModuleManagerDelegate::
         moduleProvidersFromEntryPoint = &facebook::react::provideModules;
     facebook::react::DefaultComponentsRegistry::