Skip to content

Commit bf9c94e

Browse files
j-piaseckimeta-codesync[bot]
j-piasecki
authored and
meta-codesync[bot]
committed
Use umbrella includes in Android app-facing C++ (#58843)
Summary: Pull Request resolved: #58843 App-facing C++ on Android included guarded ReactCommon headers directly, which is a hard error in app code under `RN_STRICT_API`. The default app `OnLoad.cpp` (and RN-Tester's), the generated `autolinking.h`, and the prefab-exported JNI headers in the `newarchdefaults`, `turbomodule` and `jni` packages now include React Native through module umbrellas (`<React/CallInvoker.h>`, `<React/ComponentRegistry.h>`, `<React/NativeModuleCore.h>`, `<React/RuntimeExecutor.h>`). `FabricMountingManager.h` also drops an unused include of `react/renderer/uimanager/primitives.h`. The `fabric`, `mapbuffer` and `DefaultComponentsRegistry.h` headers are handled in the parent diff. No behaviour change without `RN_STRICT_API`. Changelog: [Android][Changed] - Include React Native through module umbrella headers in app-facing JNI headers and the generated autolinking header Differential Revision: D123376722
1 parent 7403e1e commit bf9c94e

11 files changed

Lines changed: 15 additions & 19 deletions

File tree

‎packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateAutolinkingNewArchitecturesFileTask.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,10 @@ abstract class GenerateAutolinkingNewArchitecturesFileTask : DefaultTask() {
266266
267267
#pragma once
268268
269-
#include <ReactCommon/CallInvoker.h>
270-
#include <ReactCommon/JavaTurboModule.h>
271-
#include <ReactCommon/TurboModule.h>
269+
#include <React/CallInvoker.h>
270+
#include <React/ComponentRegistry.h>
271+
#include <React/NativeModuleCore.h>
272272
#include <jsi/jsi.h>
273-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
274273
275274
namespace facebook {
276275
namespace react {

‎packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include <DefaultComponentsRegistry.h>
3131
#include <DefaultTurboModuleManagerDelegate.h>
3232
#include <FBReactNativeSpec.h>
33+
#include <React/ComponentRegistry.h>
3334
#include <autolinking.h>
3435
#include <fbjni/fbjni.h>
35-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
3636

3737
#ifdef REACT_NATIVE_APP_CODEGEN_HEADER
3838
#include REACT_NATIVE_APP_CODEGEN_HEADER

‎packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <React/RendererCore.h>
1414
#include <fbjni/fbjni.h>
1515
#include <react/fabric/JFabricUIManager.h>
16-
#include <react/renderer/uimanager/primitives.h>
1716

1817
namespace facebook::react {
1918

‎packages/react-native/ReactAndroid/src/main/jni/react/jni/JRuntimeExecutor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma once
99

10-
#include <ReactCommon/RuntimeExecutor.h>
10+
#include <React/RuntimeExecutor.h>
1111
#include <fbjni/fbjni.h>
1212

1313
namespace facebook::react {

‎packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
#include <string>
1010
#include <vector>
1111

12+
#include <React/NativeModuleCore.h>
1213
#include <ReactCommon/CxxReactPackage.h>
13-
#include <ReactCommon/JavaTurboModule.h>
14-
#include <ReactCommon/TurboModule.h>
1514
#include <ReactCommon/TurboModuleManagerDelegate.h>
1615
#include <fbjni/fbjni.h>
1716

‎packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/BindingsInstallerHolder.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
#pragma once
99

10-
#include <ReactCommon/CallInvoker.h>
11-
#include <ReactCommon/TurboModule.h>
10+
#include <React/CallInvoker.h>
11+
#include <React/NativeModuleCore.h>
1212
#include <fbjni/fbjni.h>
1313

1414
namespace facebook::react {

‎packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CallInvokerHolder.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma once
99

10-
#include <ReactCommon/CallInvoker.h>
10+
#include <React/CallInvoker.h>
1111
#include <fbjni/fbjni.h>
1212
#include <memory>
1313

‎packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/NativeMethodCallInvokerHolder.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma once
99

10-
#include <ReactCommon/CallInvoker.h>
10+
#include <React/CallInvoker.h>
1111
#include <fbjni/fbjni.h>
1212
#include <memory>
1313

‎packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
#include <memory>
1313
#include <unordered_map>
1414

15+
#include <React/NativeModuleCore.h>
16+
#include <React/RuntimeExecutor.h>
1517
#include <ReactCommon/CallInvokerHolder.h>
16-
#include <ReactCommon/JavaTurboModule.h>
1718
#include <ReactCommon/NativeMethodCallInvokerHolder.h>
18-
#include <ReactCommon/RuntimeExecutor.h>
19-
#include <ReactCommon/TurboModule.h>
2019
#include <ReactCommon/TurboModuleManagerDelegate.h>
2120
#include <react/jni/JRuntimeExecutor.h>
2221

‎packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManagerDelegate.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
#pragma once
99

10-
#include <ReactCommon/CallInvoker.h>
11-
#include <ReactCommon/JavaTurboModule.h>
10+
#include <React/CallInvoker.h>
11+
#include <React/NativeModuleCore.h>
1212
#include <fbjni/fbjni.h>
1313
#include <memory>
1414
#include <string>

0 commit comments

Comments
 (0)