Commit 62cabbe
committed
fix(ios-prebuild): do not relocate SocketRocket headers into ReactNativeHeaders
Declaring SocketRocket in DEPS_NAMESPACES (added to satisfy the deps
set-equality guard) relocated textual copies of its headers into
ReactNativeHeaders and thus into the flattened React-Core-prebuilt/Headers,
which sits on every pod's HEADER_SEARCH_PATHS. The real SocketRocket pod still
exists in consumer graphs and vends the same headers, so the copies collide:
duplicate @interface definitions when the SocketRocket pod compiles
(rn-tester, prebuilt + USE_FRAMEWORKS=dynamic), and a poisoned module graph in
use_frameworks/explicit-modules apps that don't compile SocketRocket sources
(Expo: ReactCodegen/RCTModulesConformingToProtocolsProvider.h "file not
found"). Bisect confirmed removing the SocketRocket dir flips red->green and
the R11 shims are not implicated.
Add DEPS_NAMESPACES_NOT_RELOCATED: such namespaces count as declared for the
set-equality guard (a genuinely new dep still fails closed), the include
classifier still recognizes them, and the headers gate now asserts they stay
ABSENT from the artifact. Note: no CI lane covers prebuilt + use_frameworks
(the dynamic-frameworks lane builds from source), which is why CI stayed
green.1 parent 40be14d commit 62cabbe
5 files changed
Lines changed: 45 additions & 11 deletions
File tree
- packages/react-native/scripts/ios-prebuild
- __docs__
Lines changed: 3 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
356 | 356 | | |
357 | 357 | | |
358 | 358 | | |
359 | | - | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
360 | 362 | | |
361 | 363 | | |
362 | 364 | | |
| |||
Lines changed: 10 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
| |||
189 | 190 | | |
190 | 191 | | |
191 | 192 | | |
192 | | - | |
193 | | - | |
194 | | - | |
195 | | - | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
196 | 197 | | |
197 | 198 | | |
198 | 199 | | |
199 | 200 | | |
200 | 201 | | |
201 | | - | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
202 | 205 | | |
203 | 206 | | |
204 | 207 | | |
205 | 208 | | |
206 | | - | |
207 | | - | |
| 209 | + | |
| 210 | + | |
208 | 211 | | |
209 | 212 | | |
210 | 213 | | |
| |||
Lines changed: 8 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
35 | 38 | | |
36 | 39 | | |
37 | 40 | | |
| |||
77 | 80 | | |
78 | 81 | | |
79 | 82 | | |
80 | | - | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
81 | 87 | | |
82 | 88 | | |
83 | 89 | | |
| |||
Lines changed: 13 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
123 | | - | |
124 | 123 | | |
125 | 124 | | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
126 | 137 | | |
127 | 138 | | |
128 | 139 | | |
| |||
458 | 469 | | |
459 | 470 | | |
460 | 471 | | |
| 472 | + | |
461 | 473 | | |
462 | 474 | | |
463 | 475 | | |
| |||
Lines changed: 11 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| 42 | + | |
42 | 43 | | |
43 | 44 | | |
44 | 45 | | |
| |||
231 | 232 | | |
232 | 233 | | |
233 | 234 | | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
234 | 245 | | |
235 | 246 | | |
236 | 247 | | |
| |||
0 commit comments