Skip to content

Commit 8afe300

Browse files
alanleedevfacebook-github-bot
authored andcommitted
bump Folly to 2024.10.14.00 (facebook#47033)
Summary: Pull Request resolved: facebook#47033 Lastest Folly has updates to fix build errors with LLVM 19 which is also llikely needed for NDK 27 - facebook/folly@bf46c8a Changelog: [Android][Updated] - Bump Folly to 2024.10.14.00 Differential Revision: D64372125
1 parent a4b8dd9 commit 8afe300

File tree

6 files changed

+100
-100
lines changed

6 files changed

+100
-100
lines changed

packages/react-native/React/third-party.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
// LICENSE file in the root directory of this source tree.
99
//
1010

11-
HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_83_0 $(SRCROOT)/../third-party/folly-2024.01.01.00 $(SRCROOT)/../third-party/glog-0.3.5/src
11+
HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_83_0 $(SRCROOT)/../third-party/folly-2024.10.14.00 $(SRCROOT)/../third-party/glog-0.3.5/src
1212
OTHER_CFLAGS = -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_HAVE_CLOCK_GETTIME=1

packages/react-native/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,8 @@ SET(folly_FLAGS
2626
SET(folly_runtime_SRC
2727
folly/Conv.cpp
2828
folly/Demangle.cpp
29-
folly/dynamic.cpp
3029
folly/FileUtil.cpp
3130
folly/Format.cpp
32-
folly/json_pointer.cpp
33-
folly/json.cpp
3431
folly/ScopeGuard.cpp
3532
folly/SharedMutex.cpp
3633
folly/String.cpp
@@ -42,6 +39,9 @@ SET(folly_runtime_SRC
4239
folly/detail/SplitStringSimd.cpp
4340
folly/detail/UniqueInstance.cpp
4441
folly/hash/SpookyHashV2.cpp
42+
folly/json/dynamic.cpp
43+
folly/json/json_pointer.cpp
44+
folly/json/json.cpp
4545
folly/lang/CString.cpp
4646
folly/lang/SafeAssert.cpp
4747
folly/lang/ToAscii.cpp

packages/react-native/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ yoga-proguard-annotations = "1.19.0"
3636
boost="1_83_0"
3737
doubleconversion="1.1.6"
3838
fmt="9.1.0"
39-
folly="2024.01.01.00"
39+
folly="2024.10.14.00"
4040
glog="0.3.5"
4141
gtest="1.12.1"
4242

packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths
144144
spec = SpecMock.new
145145

146146
# Act
147-
NewArchitectureHelper.install_modules_dependencies(spec, true, '2024.01.01.00')
147+
NewArchitectureHelper.install_modules_dependencies(spec, true, '2024.10.14.00')
148148

149149
# Assert
150150
folly_config = Helpers::Constants.folly_config
@@ -158,7 +158,7 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths
158158
spec.dependencies,
159159
[
160160
{ :dependency_name => "React-Core" },
161-
{ :dependency_name => "RCT-Folly", "version"=>"2024.01.01.00" },
161+
{ :dependency_name => "RCT-Folly", "version"=>"2024.10.14.00" },
162162
{ :dependency_name => "glog" },
163163
{ :dependency_name => "React-RCTFabric" },
164164
{ :dependency_name => "ReactCodegen" },
@@ -190,7 +190,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler
190190
}
191191

192192
# Act
193-
NewArchitectureHelper.install_modules_dependencies(spec, false, '2024.01.01.00')
193+
NewArchitectureHelper.install_modules_dependencies(spec, false, '2024.10.14.00')
194194

195195
# Assert
196196
assert_equal(Helpers::Constants.folly_config[:compiler_flags], "#{NewArchitectureHelper.folly_compiler_flags}")
@@ -200,7 +200,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler
200200
spec.dependencies,
201201
[
202202
{ :dependency_name => "React-Core" },
203-
{ :dependency_name => "RCT-Folly", "version"=>"2024.01.01.00" },
203+
{ :dependency_name => "RCT-Folly", "version"=>"2024.10.14.00" },
204204
{ :dependency_name => "glog" },
205205
{ :dependency_name => "React-RCTFabric" },
206206
{ :dependency_name => "ReactCodegen" },

packages/react-native/scripts/cocoapods/helpers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class Constants
4747
}
4848

4949
@@folly_config = {
50-
:version => '2024.01.01.00',
50+
:version => '2024.10.14.00',
5151
:git => 'https://github.com/facebook/folly.git',
5252
:compiler_flags => '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32',
5353
:dep_name => 'RCT-Folly/Fabric'

0 commit comments

Comments
 (0)