bump Folly to 2024.10.14.00 (#47033)

Summary: 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
facebook · Oct 16, 2024 · e2bb08c · e2bb08c
1 parent 9627060
commit e2bb08c
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 100 deletions.
diff --git a/packages/react-native/React/third-party.xcconfig b/packages/react-native/React/third-party.xcconfig
@@ -8,5 +8,5 @@
 // LICENSE file in the root directory of this source tree.
 //
 
-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
+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
 OTHER_CFLAGS = -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_HAVE_CLOCK_GETTIME=1
diff --git a/packages/react-native/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt
@@ -26,11 +26,8 @@ SET(folly_FLAGS
 SET(folly_runtime_SRC
         folly/Conv.cpp
         folly/Demangle.cpp
-        folly/dynamic.cpp
         folly/FileUtil.cpp
         folly/Format.cpp
-        folly/json_pointer.cpp
-        folly/json.cpp
         folly/ScopeGuard.cpp
         folly/SharedMutex.cpp
         folly/String.cpp
@@ -42,6 +39,9 @@ SET(folly_runtime_SRC
         folly/detail/SplitStringSimd.cpp
         folly/detail/UniqueInstance.cpp
         folly/hash/SpookyHashV2.cpp
+        folly/json/dynamic.cpp
+        folly/json/json_pointer.cpp
+        folly/json/json.cpp
         folly/lang/CString.cpp
         folly/lang/SafeAssert.cpp
         folly/lang/ToAscii.cpp

diff --git a/packages/react-native/gradle/libs.versions.toml b/packages/react-native/gradle/libs.versions.toml
@@ -36,7 +36,7 @@ yoga-proguard-annotations = "1.19.0"
 boost="1_83_0"
 doubleconversion="1.1.6"
 fmt="9.1.0"
-folly="2024.01.01.00"
+folly="2024.10.14.00"
 glog="0.3.5"
 gtest="1.12.1"
 

diff --git a/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb b/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb
@@ -144,7 +144,7 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths
         spec = SpecMock.new
 
         # Act
-        NewArchitectureHelper.install_modules_dependencies(spec, true, '2024.01.01.00')
+        NewArchitectureHelper.install_modules_dependencies(spec, true, '2024.10.14.00')
 
         # Assert
         folly_config = Helpers::Constants.folly_config
@@ -158,7 +158,7 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths
             spec.dependencies,
             [
                 { :dependency_name => "React-Core" },
-                { :dependency_name => "RCT-Folly", "version"=>"2024.01.01.00" },
+                { :dependency_name => "RCT-Folly", "version"=>"2024.10.14.00" },
                 { :dependency_name => "glog" },
                 { :dependency_name => "React-RCTFabric" },
                 { :dependency_name => "ReactCodegen" },
@@ -190,7 +190,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler
         }
 
         # Act
-        NewArchitectureHelper.install_modules_dependencies(spec, false, '2024.01.01.00')
+        NewArchitectureHelper.install_modules_dependencies(spec, false, '2024.10.14.00')
 
         # Assert
         assert_equal(Helpers::Constants.folly_config[:compiler_flags], "#{NewArchitectureHelper.folly_compiler_flags}")
@@ -200,7 +200,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler
             spec.dependencies,
             [
                 { :dependency_name => "React-Core" },
-                { :dependency_name => "RCT-Folly", "version"=>"2024.01.01.00" },
+                { :dependency_name => "RCT-Folly", "version"=>"2024.10.14.00" },
                 { :dependency_name => "glog" },
                 { :dependency_name => "React-RCTFabric" },
                 { :dependency_name => "ReactCodegen" },

diff --git a/packages/react-native/scripts/cocoapods/helpers.rb b/packages/react-native/scripts/cocoapods/helpers.rb
@@ -47,7 +47,7 @@ class Constants
         }
 
         @@folly_config = {
-            :version => '2024.01.01.00',
+            :version => '2024.10.14.00',
             :git => 'https://github.com/facebook/folly.git',
             :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',
             :dep_name => 'RCT-Folly/Fabric'