Skip to content

Commit 053dd50

Browse files
j-piaseckifacebook-github-bot
authored andcommitted
Correctly link umbrella headers for iOS prebuild (#58548)
Summary: The umbrella headers under `ReactCommon/**/React/` were only linked into their nested `ReactCommon/...` include dirs during the iOS SPM prebuild, so `#include <React/Debug.h>` (and the other umbrella headers) could not be resolved by the `React` framework, breaking the build. This diff links each umbrella header directory into the `React` header dir. Changelog: [Internal] Differential Revision: D120310677
1 parent b4d57ab commit 053dd50

1 file changed

Lines changed: 17 additions & 0 deletions

File tree

  • packages/react-native/scripts/ios-prebuild

packages/react-native/scripts/ios-prebuild/setup.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,22 +162,36 @@ async function setup(
162162
'ReactCommon/react/renderer/imagemanager',
163163
'react/renderer/imagemanager',
164164
);
165+
link('ReactCommon/react/renderer/imagemanager/React', 'React');
165166
link('ReactCommon/yoga/Yoga', 'ReactCommon/yoga/Yoga');
166167
link('ReactCommon/callinvoker', 'ReactCommon');
168+
link('ReactCommon/callinvoker/React', 'React');
167169
link('ReactCommon/react/renderer/componentregistry');
170+
link('ReactCommon/react/renderer/componentregistry/React', 'React');
168171
link('ReactCommon/react/renderer/core');
172+
link('ReactCommon/react/renderer/core/React', 'React');
173+
link('ReactCommon/react/renderer/css/React', 'React');
174+
link('ReactCommon/react/renderer/components/image/React', 'React');
175+
link('ReactCommon/react/renderer/mapbuffer/React', 'React');
169176
link('ReactCommon/react/bridging');
177+
link('ReactCommon/react/bridging/React', 'React');
170178
link('ReactCommon/react/timing');
179+
link('ReactCommon/react/timing/React', 'React');
171180
link('ReactCommon/react/utils');
181+
link('ReactCommon/react/utils/React', 'React');
172182
link('ReactCommon/react/debug');
183+
link('ReactCommon/react/debug/React', 'React');
173184
link('ReactCommon/react/renderer/debug');
185+
link('ReactCommon/react/renderer/debug/React', 'React');
174186
link('ReactCommon/react/featureflags');
187+
link('ReactCommon/react/featureflags/React', 'React');
175188
link('ReactCommon/react/renderer/graphics');
176189
link(
177190
'ReactCommon/react/renderer/graphics/platform/ios',
178191
'ReactCommon/react/renderer/graphics',
179192
);
180193
link('ReactCommon/react/nativemodule/core', 'ReactCommon');
194+
link('ReactCommon/react/nativemodule/core/React', 'React');
181195
link('ReactCommon/react/nativemodule/core/platform/ios', 'ReactCommon');
182196

183197
link('ReactCommon/react/utils/platform/ios', 'ReactCommon/react/utils');
@@ -186,15 +200,18 @@ async function setup(
186200
link('ReactCommon/jsitooling/react/runtime', 'ReactCommon/react/runtime');
187201
link('ReactCommon/react/renderer/components/legacyviewmanagerinterop');
188202
link('ReactCommon/react/renderer/components/view');
203+
link('ReactCommon/react/renderer/components/view/React', 'React');
189204
link(
190205
'ReactCommon/react/renderer/components/view/platform/cxx',
191206
'ReactCommon/react/renderer/components/view',
192207
);
193208
link('ReactCommon/react/renderer/mounting');
194209
link('ReactCommon/react/renderer/attributedstring');
195210
link('ReactCommon/runtimeexecutor/ReactCommon', 'ReactCommon');
211+
link('ReactCommon/runtimeexecutor/React', 'React');
196212
link('ReactCommon/jsinspector-modern');
197213
link('ReactCommon/cxxreact');
214+
link('ReactCommon/cxxreact/React', 'React');
198215

199216
link('.build/codegen/build/generated/ios', 'ReactCodegen');
200217
}

0 commit comments

Comments
 (0)