Skip to content

Commit fc803c5

Browse files
j-piaseckimeta-codesync[bot]
authored andcommitted
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`, `fabric`, `jni` and `mapbuffer` packages now include React Native through module umbrellas (`<React/CallInvoker.h>`, `<React/ComponentRegistry.h>`, `<React/Debug.h>`, `<React/MapBuffer.h>`, `<React/NativeModuleCore.h>`, `<React/RendererCore.h>`, `<React/RuntimeExecutor.h>`). `FabricMountingManager.h` also drops an unused include of `react/renderer/uimanager/primitives.h`. 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 52efed6 commit fc803c5

18 files changed

Lines changed: 25 additions & 31 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/AndroidEventBeat.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 <react/renderer/core/EventBeat.h>
10+
#include <React/RendererCore.h>
1111

1212
#include "EventBeatManager.h"
1313

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

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

88
#pragma once
99

10+
#include <React/ComponentRegistry.h>
1011
#include <fbjni/fbjni.h>
11-
#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
12-
#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
1312

1413
namespace facebook::react {
1514

‎packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.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 <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
10+
#include <React/ComponentRegistry.h>
1111

1212
namespace facebook::react::CoreComponentsRegistry {
1313

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

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

88
#pragma once
99

10+
#include <React/RendererCore.h>
1011
#include <fbjni/fbjni.h>
1112
#include <react/jni/ReadableNativeMap.h>
12-
#include <react/renderer/core/EventEmitter.h>
1313

1414
namespace facebook::react {
1515

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
#include <mutex>
1111
#include <unordered_map>
1212

13+
#include <React/RendererCore.h>
1314
#include <fbjni/fbjni.h>
1415
#include <react/fabric/JFabricUIManager.h>
15-
#include <react/renderer/core/Props.h>
16-
#include <react/renderer/uimanager/primitives.h>
1716

1817
namespace facebook::react {
1918

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

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

88
#pragma once
99

10+
#include <React/RendererCore.h>
1011
#include <fbjni/fbjni.h>
1112
#include <react/common/mapbuffer/JReadableMapBuffer.h>
1213
#include <react/jni/ReadableNativeMap.h>
13-
#include <react/renderer/core/State.h>
1414
#include <react/uimanager/StateWrapper.h>
1515

1616
namespace facebook::react {

‎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/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.h‎

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

88
#pragma once
99

10+
#include <React/Debug.h>
11+
#include <React/MapBuffer.h>
1012
#include <fbjni/fbjni.h>
11-
#include <react/debug/react_native_assert.h>
12-
#include <react/renderer/mapbuffer/MapBuffer.h>
1313

1414
#include <fbjni/ByteBuffer.h>
1515

0 commit comments

Comments
 (0)