From b804ff80d89c91660e40e5ec58a021cec8bf80f6 Mon Sep 17 00:00:00 2001 From: Rob Hogan Date: Fri, 12 Jul 2024 08:25:05 -0700 Subject: [PATCH] Include folly::detail::base64 in folly dependency, unbreak CI (#45416) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/45416 Add sources for `folly::detail::base64` to our existing `folly` dependency for Android and iOS OSS build toolchains, now a (tiny) dependency of the JS debugger since D54309633, and already part of Folly's Buck sources. Changelog: [Internal] Differential Revision: D59683572 --- .../src/main/jni/third-party/folly/CMakeLists.txt | 3 +++ packages/react-native/third-party-podspecs/RCT-Folly.podspec | 5 +++++ 2 files changed, 8 insertions(+) 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 index 9cef8e899639ac..fb09e10dfb6e3c 100644 --- 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 @@ -37,6 +37,9 @@ SET(folly_runtime_SRC folly/Unicode.cpp folly/concurrency/CacheLocality.cpp folly/container/detail/F14Table.cpp + folly/detail/base64_detail/Base64_SSE4_2.cpp + folly/detail/base64_detail/Base64Api.cpp + folly/detail/base64_detail/Base64SWAR.cpp folly/detail/FileUtilDetail.cpp folly/detail/Futex.cpp folly/detail/SplitStringSimd.cpp diff --git a/packages/react-native/third-party-podspecs/RCT-Folly.podspec b/packages/react-native/third-party-podspecs/RCT-Folly.podspec index ec77b9b95ed4a3..0e98b6450dd547 100644 --- a/packages/react-native/third-party-podspecs/RCT-Folly.podspec +++ b/packages/react-native/third-party-podspecs/RCT-Folly.podspec @@ -41,6 +41,9 @@ Pod::Spec.new do |spec| 'folly/detail/FileUtilDetail.cpp', 'folly/detail/SplitStringSimd.cpp', 'folly/detail/UniqueInstance.cpp', + 'folly/detail/base64_detail/Base64_SSE4_2.cpp', + 'folly/detail/base64_detail/Base64Api.cpp', + 'folly/detail/base64_detail/Base64SWAR.cpp', 'folly/hash/SpookyHashV2.cpp', 'folly/lang/Assume.cpp', 'folly/lang/CString.cpp', @@ -55,6 +58,7 @@ Pod::Spec.new do |spec| 'folly/container/*.h', 'folly/container/detail/*.h', 'folly/detail/*.h', + 'folly/detail/base64_detail/*.h', 'folly/functional/*.h', 'folly/hash/*.h', 'folly/lang/*.h', @@ -70,6 +74,7 @@ Pod::Spec.new do |spec| 'folly/container/*.h', 'folly/container/detail/*.h', 'folly/detail/*.h', + 'folly/detail/base64_detail/*.h', 'folly/functional/*.h', 'folly/hash/*.h', 'folly/lang/*.h',