Skip to content

Commit 2fa9c85

Browse files
cipolleschifacebook-github-bot
authored andcommitted
Avoid duplicated symbols for FollyConvert.h functions (#51393)
Summary: Pull Request resolved: #51393 In D74738548 we copied RCTFollyConvert to Follyconvert and we moved it to a separate file. The problem is that when we build react native, we now might have duplicated symbols, especially with prebuilds where the symbols are "flattened" together. To fix this, we can have the old file point to the new file in order not to break our suers and have a single symbol anyway. ## Changelog: [Internal] - Reviewed By: sammy-SC Differential Revision: D74883143 fbshipit-source-id: 98361307286cdc19c57b8f5c9f066aebea992896
1 parent 55cf1e7 commit 2fa9c85

File tree

2 files changed

+8
-126
lines changed

2 files changed

+8
-126
lines changed

packages/react-native/React/CxxUtils/RCTFollyConvert.h

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

88
#import <Foundation/Foundation.h>
99

10-
#include <folly/dynamic.h>
10+
#include <react/utils/FollyConvert.h>
1111

12-
namespace facebook::react {
12+
// This file has been moved to `react/utils/FollyConvert.h`.
13+
// We are keeping the header here for backwards compatibility.
1314

14-
[[deprecated(
15-
"This function is deprecated, please use /ReactCommon/react/utils/platform/ios/react/utils/FollyConvert.h instead")]]
16-
folly::dynamic convertIdToFollyDynamic(id json);
17-
[[deprecated(
18-
"This function is deprecated, please use /ReactCommon/react/utils/platform/ios/react/utils/FollyConvert.h instead")]]
19-
id convertFollyDynamicToId(const folly::dynamic& dyn);
20-
21-
} // namespace facebook::react
15+
#warning \
16+
"[DEPRECATION] `React/RCTFollyconvert.h` is deprecated and will be removed in the future. \
17+
If this warning appears due to a library, please open an issue in that library, and ask for an update. \
18+
Please, replace the `#include <React/RCTFollyConver.h>` statements \
19+
with `#include <react/utils/FollyConvert.h>`."

packages/react-native/React/CxxUtils/RCTFollyConvert.mm

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)