From aba82a503d39e7a341630aabdcf02762e392dbea Mon Sep 17 00:00:00 2001
From: Nicola Corti <ncor@fb.com>
Date: Wed, 14 Sep 2022 04:06:53 -0700
Subject: [PATCH] Update the OnLoad.cpp to use the facebook::react namespace

Summary:
Small follow up to my template update. Using the namespace in the OnLoad.cpp
should prevent name clashing and make it easier to read.

Changelog:
[Android] [Changed] - Update the OnLoad.cpp to use the facebook::react namespace

Reviewed By: cipolleschi

Differential Revision: D39475773

fbshipit-source-id: 9c0748d37858196d4e8ea6674d9cfd6ef4eff1cd
---
 .../android/app/src/main/jni/OnLoad.cpp       | 22 ++++++++++++-------
 template/android/app/src/main/jni/OnLoad.cpp  | 22 ++++++++++++-------
 2 files changed, 28 insertions(+), 16 deletions(-)

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 df67d208f0b7aa..ae21e72a4dccff 100644
--- a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp
+++ b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp
@@ -14,16 +14,18 @@
 #include <react/renderer/components/AppSpecs/ComponentDescriptors.h>
 #include <rncore.h>
 
+namespace facebook {
+namespace react {
+
 void registerComponents(
-    std::shared_ptr<facebook::react::ComponentDescriptorProviderRegistry const>
-        registry) {
-  registry->add(facebook::react::concreteComponentDescriptorProvider<
-                facebook::react::RNTMyNativeViewComponentDescriptor>());
+    std::shared_ptr<ComponentDescriptorProviderRegistry const> registry) {
+  registry->add(concreteComponentDescriptorProvider<
+                RNTMyNativeViewComponentDescriptor>());
 }
 
-std::shared_ptr<facebook::react::TurboModule> provideModules(
+std::shared_ptr<TurboModule> provideModules(
     const std::string &name,
-    const facebook::react::JavaTurboModule::InitParams &params) {
+    const JavaTurboModule::InitParams &params) {
   auto module = AppSpecs_ModuleProvider(name, params);
   if (module != nullptr) {
     return module;
@@ -35,11 +37,15 @@ std::shared_ptr<facebook::react::TurboModule> provideModules(
   return rncore_ModuleProvider(name, params);
 }
 
+} // namespace react
+} // namespace facebook
+
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(vm, [] {
     facebook::react::DefaultTurboModuleManagerDelegate::
-        moduleProvidersFromEntryPoint = &provideModules;
+        moduleProvidersFromEntryPoint = &facebook::react::provideModules;
     facebook::react::DefaultComponentsRegistry::
-        registerComponentDescriptorsFromEntryPoint = &registerComponents;
+        registerComponentDescriptorsFromEntryPoint =
+            &facebook::react::registerComponents;
   });
 }
diff --git a/template/android/app/src/main/jni/OnLoad.cpp b/template/android/app/src/main/jni/OnLoad.cpp
index 5a04a57ae01114..117fad7d6454a6 100644
--- a/template/android/app/src/main/jni/OnLoad.cpp
+++ b/template/android/app/src/main/jni/OnLoad.cpp
@@ -4,9 +4,11 @@
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 #include <rncli.h>
 
+namespace facebook {
+namespace react {
+
 void registerComponents(
-    std::shared_ptr<facebook::react::ComponentDescriptorProviderRegistry const>
-        registry) {
+    std::shared_ptr<ComponentDescriptorProviderRegistry const> registry) {
   // Custom Fabric Components go here. You can register custom
   // components coming from your App or from 3rd party libraries here.
   //
@@ -14,12 +16,12 @@ void registerComponents(
   //        AocViewerComponentDescriptor>());
 
   // By default we just use the components autolinked by RN CLI
-  facebook::react::rncli_registerProviders(registry);
+  rncli_registerProviders(registry);
 }
 
-std::shared_ptr<facebook::react::TurboModule> provideModules(
+std::shared_ptr<TurboModule> provideModules(
     const std::string &name,
-    const facebook::react::JavaTurboModule::InitParams &params) {
+    const JavaTurboModule::InitParams &params) {
   // Here you can provide your own module provider for TurboModules coming from
   // either your application or from external libraries. The approach to follow
   // is similar to the following (for a library called `samplelibrary`):
@@ -31,14 +33,18 @@ std::shared_ptr<facebook::react::TurboModule> provideModules(
   // return rncore_ModuleProvider(moduleName, params);
 
   // By default we just use the module providers autolinked by RN CLI
-  return facebook::react::rncli_ModuleProvider(name, params);
+  return rncli_ModuleProvider(name, params);
 }
 
+} // namespace react
+} // namespace facebook
+
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(vm, [] {
     facebook::react::DefaultTurboModuleManagerDelegate::
-        moduleProvidersFromEntryPoint = &provideModules;
+        moduleProvidersFromEntryPoint = &facebook::react::provideModules;
     facebook::react::DefaultComponentsRegistry::
-        registerComponentDescriptorsFromEntryPoint = &registerComponents;
+        registerComponentDescriptorsFromEntryPoint =
+            &facebook::react::registerComponents;
   });
 }