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 df67d208f0b..ae21e72a4dc 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 #include +namespace facebook { +namespace react { + void registerComponents( - std::shared_ptr - registry) { - registry->add(facebook::react::concreteComponentDescriptorProvider< - facebook::react::RNTMyNativeViewComponentDescriptor>()); + std::shared_ptr registry) { + registry->add(concreteComponentDescriptorProvider< + RNTMyNativeViewComponentDescriptor>()); } -std::shared_ptr provideModules( +std::shared_ptr provideModules( const std::string &name, - const facebook::react::JavaTurboModule::InitParams ¶ms) { + const JavaTurboModule::InitParams ¶ms) { auto module = AppSpecs_ModuleProvider(name, params); if (module != nullptr) { return module; @@ -35,11 +37,15 @@ std::shared_ptr 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 = ®isterComponents; + 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 5a04a57ae01..117fad7d645 100644 --- a/template/android/app/src/main/jni/OnLoad.cpp +++ b/template/android/app/src/main/jni/OnLoad.cpp @@ -4,9 +4,11 @@ #include #include +namespace facebook { +namespace react { + void registerComponents( - std::shared_ptr - registry) { + std::shared_ptr 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 provideModules( +std::shared_ptr provideModules( const std::string &name, - const facebook::react::JavaTurboModule::InitParams ¶ms) { + const JavaTurboModule::InitParams ¶ms) { // 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 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 = ®isterComponents; + registerComponentDescriptorsFromEntryPoint = + &facebook::react::registerComponents; }); }