From e5874d90e20adce5c0350ce1794c6c1f759eae3b Mon Sep 17 00:00:00 2001 From: Andrei Shikov Date: Wed, 16 Mar 2022 08:10:55 -0700 Subject: [PATCH] Folly_runtime for CMake Summary: Ports improvements from Android.mk setup to CMake, replacing folly_json and futures with runtime where plausible Changelog: [Internal] - CMake folly_runtime setup Reviewed By: cortinico Differential Revision: D34854295 fbshipit-source-id: fa882a9cd0b78feb20f8abcc9350c27702375def --- .../hermes/reactexecutor/CMakeLists.txt | 2 +- .../react/common/mapbuffer/jni/CMakeLists.txt | 3 +- .../facebook/react/jscexecutor/CMakeLists.txt | 2 +- .../react/modules/blob/jni/CMakeLists.txt | 2 +- .../react/uimanager/jni/CMakeLists.txt | 3 +- .../src/main/jni/react/jni/CMakeLists.txt | 4 +- .../main/jni/third-party/folly/CMakeLists.txt | 39 ++++++++++--------- ReactCommon/cxxreact/CMakeLists.txt | 2 +- ReactCommon/hermes/inspector/CMakeLists.txt | 2 +- ReactCommon/jsi/CMakeLists.txt | 4 +- ReactCommon/jsiexecutor/CMakeLists.txt | 2 +- ReactCommon/react/debug/CMakeLists.txt | 2 +- .../react/nativemodule/core/CMakeLists.txt | 2 +- .../react/renderer/animations/CMakeLists.txt | 3 +- .../renderer/attributedstring/CMakeLists.txt | 3 +- .../renderer/componentregistry/CMakeLists.txt | 3 +- .../componentregistry/native/CMakeLists.txt | 3 +- .../renderer/components/image/CMakeLists.txt | 2 +- .../renderer/components/root/CMakeLists.txt | 3 +- .../components/scrollview/CMakeLists.txt | 3 +- .../renderer/components/text/CMakeLists.txt | 2 +- .../components/textinput/CMakeLists.txt | 2 +- .../unimplementedview/CMakeLists.txt | 3 +- .../react/renderer/components/view/Android.mk | 1 - .../renderer/components/view/CMakeLists.txt | 3 +- .../react/renderer/core/CMakeLists.txt | 3 +- .../react/renderer/debug/CMakeLists.txt | 2 +- .../react/renderer/graphics/CMakeLists.txt | 2 +- .../renderer/imagemanager/CMakeLists.txt | 2 +- .../react/renderer/mounting/CMakeLists.txt | 3 +- .../react/renderer/scheduler/CMakeLists.txt | 3 +- .../react/renderer/telemetry/CMakeLists.txt | 3 +- .../renderer/templateprocessor/CMakeLists.txt | 3 +- .../renderer/textlayoutmanager/CMakeLists.txt | 3 +- .../react/renderer/uimanager/CMakeLists.txt | 3 +- 35 files changed, 55 insertions(+), 72 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/CMakeLists.txt b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/CMakeLists.txt index c4d47fb0123..d446141c7ed 100644 --- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/CMakeLists.txt +++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries( jsireact fb fbjni - folly_json + folly_runtime hermes-engine::libhermes jsi reactnativejni diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/CMakeLists.txt b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/CMakeLists.txt index 680ab4bd274..0aca9cb0f4e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/CMakeLists.txt +++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/CMakeLists.txt @@ -23,8 +23,7 @@ target_include_directories(mapbufferjni target_link_libraries(mapbufferjni fb fbjni - folly_futures - folly_json + folly_runtime glog glog_init react_debug diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/CMakeLists.txt b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/CMakeLists.txt index 193426ca041..464aa19ccef 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/CMakeLists.txt +++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/CMakeLists.txt @@ -18,6 +18,6 @@ target_link_libraries(jscexecutor jscruntime fb fbjni - folly_json + folly_runtime jsi reactnativejni) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/CMakeLists.txt b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/CMakeLists.txt index 023737c44ad..d28871fdff6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/CMakeLists.txt +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/CMakeLists.txt @@ -17,6 +17,6 @@ target_link_libraries(reactnativeblob jsireact fb fbjni - folly_json + folly_runtime jsi reactnativejni) diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/CMakeLists.txt b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/CMakeLists.txt index 411832021cb..3a3dbe33212 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/CMakeLists.txt +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/CMakeLists.txt @@ -16,8 +16,7 @@ target_include_directories(uimanagerjni PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(uimanagerjni fb fbjni - folly_futures - folly_json + folly_runtime glog glog_init rrc_native diff --git a/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt index bacaa743f2d..e1a8f58857a 100644 --- a/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt +++ b/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries(reactnativeutilsjni callinvokerholder fb fbjni - folly_json + folly_runtime glog_init react_render_runtimescheduler reactnative @@ -61,7 +61,7 @@ target_link_libraries(reactnativejni callinvokerholder fb fbjni - folly_json + folly_runtime glog_init logger react_render_runtimescheduler diff --git a/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt b/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt index 7b06ec29819..3df8389ed82 100644 --- a/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt +++ b/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt @@ -19,10 +19,18 @@ SET(folly_FLAGS ) ################## -### folly_json ### +### folly_runtime ### ################## -SET(folly_json_SRC +SET(folly_runtime_SRC + folly/SharedMutex.cpp + folly/concurrency/CacheLocality.cpp + folly/detail/Futex.cpp + folly/lang/SafeAssert.cpp + folly/lang/ToAscii.cpp + folly/synchronization/ParkingLot.cpp + folly/system/ThreadId.cpp + folly/system/ThreadName.cpp folly/json.cpp folly/Unicode.cpp folly/Conv.cpp @@ -35,21 +43,19 @@ SET(folly_json_SRC folly/net/NetOps.cpp folly/json_pointer.cpp folly/lang/CString.cpp - folly/lang/SafeAssert.cpp folly/detail/UniqueInstance.cpp folly/hash/SpookyHashV2.cpp folly/container/detail/F14Table.cpp folly/ScopeGuard.cpp - folly/portability/SysUio.cpp - folly/lang/ToAscii.cpp) + folly/portability/SysUio.cpp) IF (CMAKE_BUILD_TYPE MATCHES Debug) - list(APPEND folly_json_SRC folly/lang/Assume.cpp) + list(APPEND folly_runtime_SRC folly/lang/Assume.cpp) ENDIF () -add_library(folly_json SHARED ${folly_json_SRC}) +add_library(folly_runtime SHARED ${folly_runtime_SRC}) -target_compile_options(folly_json +target_compile_options(folly_runtime PRIVATE -fexceptions -fno-omit-frame-pointer @@ -57,26 +63,24 @@ target_compile_options(folly_json -Wno-sign-compare ${folly_FLAGS}) -target_compile_options(folly_json PUBLIC ${folly_FLAGS}) +target_compile_options(folly_runtime PUBLIC ${folly_FLAGS}) -target_include_directories(folly_json PUBLIC .) -target_link_libraries(folly_json glog double-conversion boost fmt) +target_include_directories(folly_runtime PUBLIC .) +target_link_libraries(folly_runtime glog double-conversion boost fmt) ##################### ### folly_futures ### ##################### -add_library(folly_futures SHARED +add_library(folly_futures STATIC folly/ExceptionWrapper.cpp folly/ExceptionString.cpp folly/Executor.cpp - folly/SharedMutex.cpp folly/Singleton.cpp folly/Try.cpp folly/concurrency/CacheLocality.cpp folly/detail/AsyncTrace.cpp folly/detail/AtFork.cpp - folly/detail/Futex.cpp folly/detail/MemoryIdler.cpp folly/detail/SingletonStackTrace.cpp folly/detail/StaticSingletonManager.cpp @@ -106,12 +110,9 @@ add_library(folly_futures SHARED folly/portability/SysMembarrier.cpp folly/synchronization/AsymmetricMemoryBarrier.cpp folly/synchronization/Hazptr.cpp - folly/synchronization/ParkingLot.cpp folly/synchronization/WaitOptions.cpp folly/synchronization/detail/Sleeper.cpp - folly/system/Pid.cpp - folly/system/ThreadId.cpp - folly/system/ThreadName.cpp) + folly/system/Pid.cpp) target_compile_options(folly_futures PRIVATE @@ -122,4 +123,4 @@ target_compile_options(folly_futures -Wno-unused-variable) target_include_directories(folly_futures PUBLIC .) -target_link_libraries(folly_futures glog double-conversion folly_json boost event fmt) +target_link_libraries(folly_futures glog double-conversion folly_runtime boost event fmt) diff --git a/ReactCommon/cxxreact/CMakeLists.txt b/ReactCommon/cxxreact/CMakeLists.txt index ace8f7c982c..5518b0909ef 100644 --- a/ReactCommon/cxxreact/CMakeLists.txt +++ b/ReactCommon/cxxreact/CMakeLists.txt @@ -20,7 +20,7 @@ target_include_directories(reactnative PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(reactnative boost callinvoker - folly_json + folly_runtime glog jsi jsinspector diff --git a/ReactCommon/hermes/inspector/CMakeLists.txt b/ReactCommon/hermes/inspector/CMakeLists.txt index 679c916b9d2..14f6f1ce263 100644 --- a/ReactCommon/hermes/inspector/CMakeLists.txt +++ b/ReactCommon/hermes/inspector/CMakeLists.txt @@ -26,7 +26,7 @@ target_link_libraries(hermes-inspector fb fbjni folly_futures - folly_json + folly_runtime glog hermes-engine::libhermes jsi) diff --git a/ReactCommon/jsi/CMakeLists.txt b/ReactCommon/jsi/CMakeLists.txt index d4bf231143e..3f2a8c15d3f 100644 --- a/ReactCommon/jsi/CMakeLists.txt +++ b/ReactCommon/jsi/CMakeLists.txt @@ -23,7 +23,7 @@ add_library(jsi SHARED ${jsi_SRC}) target_include_directories(jsi PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(jsi - folly_json + folly_runtime glog) ################## @@ -36,7 +36,7 @@ add_library(jscruntime STATIC target_include_directories(jscruntime PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(jscruntime folly_json jsc glog) +target_link_libraries(jscruntime folly_runtime jsc glog) # TODO: Remove this flag when ready. # Android has this enabled by default, but the flag is still needed for iOS. diff --git a/ReactCommon/jsiexecutor/CMakeLists.txt b/ReactCommon/jsiexecutor/CMakeLists.txt index 50f922c7217..68597560a0c 100644 --- a/ReactCommon/jsiexecutor/CMakeLists.txt +++ b/ReactCommon/jsiexecutor/CMakeLists.txt @@ -18,6 +18,6 @@ target_include_directories(jsireact PUBLIC .) target_link_libraries(jsireact reactnative reactperflogger - folly_json + folly_runtime glog jsi) diff --git a/ReactCommon/react/debug/CMakeLists.txt b/ReactCommon/react/debug/CMakeLists.txt index f4b205314a9..c325fcead16 100644 --- a/ReactCommon/react/debug/CMakeLists.txt +++ b/ReactCommon/react/debug/CMakeLists.txt @@ -19,4 +19,4 @@ add_library(react_debug SHARED ${react_debug_SRC}) target_include_directories(react_debug PUBLIC ${REACT_COMMON_DIR}) -target_link_libraries(react_debug log folly_json) +target_link_libraries(react_debug log folly_runtime) diff --git a/ReactCommon/react/nativemodule/core/CMakeLists.txt b/ReactCommon/react/nativemodule/core/CMakeLists.txt index 844e3493a22..841ee87087c 100644 --- a/ReactCommon/react/nativemodule/core/CMakeLists.txt +++ b/ReactCommon/react/nativemodule/core/CMakeLists.txt @@ -24,7 +24,7 @@ target_include_directories(react_nativemodule_core target_link_libraries(react_nativemodule_core fbjni - folly_json + folly_runtime jsi react_bridging react_debug diff --git a/ReactCommon/react/renderer/animations/CMakeLists.txt b/ReactCommon/react/renderer/animations/CMakeLists.txt index 9d325d51d31..75e3bc4c363 100644 --- a/ReactCommon/react/renderer/animations/CMakeLists.txt +++ b/ReactCommon/react/renderer/animations/CMakeLists.txt @@ -14,8 +14,7 @@ add_library(react_render_animations SHARED ${react_render_animations_SRC}) target_include_directories(react_render_animations PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_render_animations - folly_futures - folly_json + folly_runtime glog glog_init jsi diff --git a/ReactCommon/react/renderer/attributedstring/CMakeLists.txt b/ReactCommon/react/renderer/attributedstring/CMakeLists.txt index decca1b6310..03bc7df962d 100644 --- a/ReactCommon/react/renderer/attributedstring/CMakeLists.txt +++ b/ReactCommon/react/renderer/attributedstring/CMakeLists.txt @@ -15,8 +15,7 @@ target_include_directories(react_render_attributedstring PUBLIC ${REACT_COMMON_D target_link_libraries(react_render_attributedstring butter - folly_futures - folly_json + folly_runtime glog glog_init react_debug diff --git a/ReactCommon/react/renderer/componentregistry/CMakeLists.txt b/ReactCommon/react/renderer/componentregistry/CMakeLists.txt index 8b924260dfd..23b256112aa 100644 --- a/ReactCommon/react/renderer/componentregistry/CMakeLists.txt +++ b/ReactCommon/react/renderer/componentregistry/CMakeLists.txt @@ -14,8 +14,7 @@ add_library(react_render_componentregistry SHARED ${react_render_componentregist target_include_directories(react_render_componentregistry PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_render_componentregistry - folly_futures - folly_json + folly_runtime glog_init jsi react_debug diff --git a/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt b/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt index 89c0792c4bf..270c2e43345 100644 --- a/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt +++ b/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt @@ -14,8 +14,7 @@ add_library(rrc_native SHARED ${rrc_native_SRC}) target_include_directories(rrc_native PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(rrc_native - folly_futures - folly_json + folly_runtime glog_init jsi react_debug diff --git a/ReactCommon/react/renderer/components/image/CMakeLists.txt b/ReactCommon/react/renderer/components/image/CMakeLists.txt index 49b8030a4a1..c78c9a26b80 100644 --- a/ReactCommon/react/renderer/components/image/CMakeLists.txt +++ b/ReactCommon/react/renderer/components/image/CMakeLists.txt @@ -15,7 +15,7 @@ target_include_directories(rrc_image PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(rrc_image glog - folly_json + folly_runtime glog_init jsi react_debug diff --git a/ReactCommon/react/renderer/components/root/CMakeLists.txt b/ReactCommon/react/renderer/components/root/CMakeLists.txt index 2da824a8ece..96b43b7498a 100644 --- a/ReactCommon/react/renderer/components/root/CMakeLists.txt +++ b/ReactCommon/react/renderer/components/root/CMakeLists.txt @@ -14,8 +14,7 @@ add_library(rrc_root SHARED ${rrc_root_SRC}) target_include_directories(rrc_root PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(rrc_root - folly_futures - folly_json + folly_runtime glog glog_init react_debug diff --git a/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt b/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt index 5d64f56ab05..92927ff9678 100644 --- a/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt +++ b/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt @@ -15,8 +15,7 @@ target_include_directories(rrc_scrollview PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(rrc_scrollview glog - folly_futures - folly_json + folly_runtime glog_init jsi react_debug diff --git a/ReactCommon/react/renderer/components/text/CMakeLists.txt b/ReactCommon/react/renderer/components/text/CMakeLists.txt index 404c5d429e8..392d76171b4 100644 --- a/ReactCommon/react/renderer/components/text/CMakeLists.txt +++ b/ReactCommon/react/renderer/components/text/CMakeLists.txt @@ -15,7 +15,7 @@ target_include_directories(rrc_text PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(rrc_text glog - folly_json + folly_runtime glog_init jsi react_debug diff --git a/ReactCommon/react/renderer/components/textinput/CMakeLists.txt b/ReactCommon/react/renderer/components/textinput/CMakeLists.txt index cd91ccf67ce..863494fc417 100644 --- a/ReactCommon/react/renderer/components/textinput/CMakeLists.txt +++ b/ReactCommon/react/renderer/components/textinput/CMakeLists.txt @@ -20,7 +20,7 @@ target_include_directories(rrc_textinput target_link_libraries(rrc_textinput glog - folly_json + folly_runtime glog_init jsi react_debug diff --git a/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt b/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt index 0093c01eab2..7b128501bd8 100644 --- a/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt +++ b/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt @@ -15,8 +15,7 @@ target_include_directories(rrc_unimplementedview PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(rrc_unimplementedview glog - folly_futures - folly_json + folly_runtime glog_init jsi react_debug diff --git a/ReactCommon/react/renderer/components/view/Android.mk b/ReactCommon/react/renderer/components/view/Android.mk index 59d3b01ed9a..01f14d057ca 100644 --- a/ReactCommon/react/renderer/components/view/Android.mk +++ b/ReactCommon/react/renderer/components/view/Android.mk @@ -24,7 +24,6 @@ LOCAL_STATIC_LIBRARIES := LOCAL_SHARED_LIBRARIES := \ glog \ libfolly_runtime \ - libfolly_futures \ libglog_init \ libjsi \ libreact_debug \ diff --git a/ReactCommon/react/renderer/components/view/CMakeLists.txt b/ReactCommon/react/renderer/components/view/CMakeLists.txt index f11b2077112..6320bd0bdfb 100644 --- a/ReactCommon/react/renderer/components/view/CMakeLists.txt +++ b/ReactCommon/react/renderer/components/view/CMakeLists.txt @@ -14,8 +14,7 @@ add_library(rrc_view SHARED ${rrc_view_SRC}) target_include_directories(rrc_view PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(rrc_view - folly_futures - folly_json + folly_runtime glog glog_init jsi diff --git a/ReactCommon/react/renderer/core/CMakeLists.txt b/ReactCommon/react/renderer/core/CMakeLists.txt index c63d82f867a..890e6e68c8d 100644 --- a/ReactCommon/react/renderer/core/CMakeLists.txt +++ b/ReactCommon/react/renderer/core/CMakeLists.txt @@ -13,8 +13,7 @@ add_library(react_render_core SHARED ${react_render_core_SRC}) target_include_directories(react_render_core PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_render_core - folly_futures - folly_json + folly_runtime glog jsi react_debug diff --git a/ReactCommon/react/renderer/debug/CMakeLists.txt b/ReactCommon/react/renderer/debug/CMakeLists.txt index 04bda64b346..44c5fd4c92d 100644 --- a/ReactCommon/react/renderer/debug/CMakeLists.txt +++ b/ReactCommon/react/renderer/debug/CMakeLists.txt @@ -12,4 +12,4 @@ file(GLOB react_render_debug_SRC CONFIGURE_DEPENDS *.cpp) add_library(react_render_debug SHARED ${react_render_debug_SRC}) target_include_directories(react_render_debug PUBLIC ${REACT_COMMON_DIR}) -target_link_libraries(react_render_debug folly_json) +target_link_libraries(react_render_debug folly_runtime) diff --git a/ReactCommon/react/renderer/graphics/CMakeLists.txt b/ReactCommon/react/renderer/graphics/CMakeLists.txt index a566f9b1c2f..a52ce0bfe1f 100644 --- a/ReactCommon/react/renderer/graphics/CMakeLists.txt +++ b/ReactCommon/react/renderer/graphics/CMakeLists.txt @@ -22,4 +22,4 @@ target_include_directories(react_render_graphics ${CMAKE_CURRENT_SOURCE_DIR}/platform/cxx/ ) -target_link_libraries(react_render_graphics glog fb fbjni folly_json react_debug) +target_link_libraries(react_render_graphics glog fb fbjni folly_runtime react_debug) diff --git a/ReactCommon/react/renderer/imagemanager/CMakeLists.txt b/ReactCommon/react/renderer/imagemanager/CMakeLists.txt index a53133c95e2..c27b11febcc 100644 --- a/ReactCommon/react/renderer/imagemanager/CMakeLists.txt +++ b/ReactCommon/react/renderer/imagemanager/CMakeLists.txt @@ -25,7 +25,7 @@ target_include_directories(react_render_imagemanager ) target_link_libraries(react_render_imagemanager - folly_json + folly_runtime react_debug react_render_core react_render_debug diff --git a/ReactCommon/react/renderer/mounting/CMakeLists.txt b/ReactCommon/react/renderer/mounting/CMakeLists.txt index 6b6209a24a3..58b31243624 100644 --- a/ReactCommon/react/renderer/mounting/CMakeLists.txt +++ b/ReactCommon/react/renderer/mounting/CMakeLists.txt @@ -16,8 +16,7 @@ target_include_directories(react_render_mounting PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_render_mounting butter - folly_futures - folly_json + folly_runtime glog glog_init jsi diff --git a/ReactCommon/react/renderer/scheduler/CMakeLists.txt b/ReactCommon/react/renderer/scheduler/CMakeLists.txt index 260e40cba8b..3823b9d3c1e 100644 --- a/ReactCommon/react/renderer/scheduler/CMakeLists.txt +++ b/ReactCommon/react/renderer/scheduler/CMakeLists.txt @@ -14,8 +14,7 @@ add_library(react_render_scheduler SHARED ${react_render_scheduler_SRC}) target_include_directories(react_render_scheduler PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_render_scheduler - folly_futures - folly_json + folly_runtime glog jsi react_config diff --git a/ReactCommon/react/renderer/telemetry/CMakeLists.txt b/ReactCommon/react/renderer/telemetry/CMakeLists.txt index bcbbf0b82f2..cad8f9e81cd 100644 --- a/ReactCommon/react/renderer/telemetry/CMakeLists.txt +++ b/ReactCommon/react/renderer/telemetry/CMakeLists.txt @@ -15,8 +15,7 @@ target_include_directories(react_render_telemetry PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_render_telemetry butter - folly_futures - folly_json + folly_runtime glog glog_init react_debug diff --git a/ReactCommon/react/renderer/templateprocessor/CMakeLists.txt b/ReactCommon/react/renderer/templateprocessor/CMakeLists.txt index 07d119ceacb..2aeaa6d101f 100644 --- a/ReactCommon/react/renderer/templateprocessor/CMakeLists.txt +++ b/ReactCommon/react/renderer/templateprocessor/CMakeLists.txt @@ -14,8 +14,7 @@ add_library(react_render_templateprocessor SHARED ${react_render_templateprocess target_include_directories(react_render_templateprocessor PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_render_templateprocessor - folly_futures - folly_json + folly_runtime glog jsi react_config diff --git a/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt b/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt index 2098cbe60a8..cb12805f3c5 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt +++ b/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt @@ -26,8 +26,7 @@ target_link_libraries(react_render_textlayoutmanager glog fb fbjni - folly_futures - folly_json + folly_runtime glog_init mapbufferjni react_debug diff --git a/ReactCommon/react/renderer/uimanager/CMakeLists.txt b/ReactCommon/react/renderer/uimanager/CMakeLists.txt index 42433e50292..0d9f7403b05 100644 --- a/ReactCommon/react/renderer/uimanager/CMakeLists.txt +++ b/ReactCommon/react/renderer/uimanager/CMakeLists.txt @@ -15,8 +15,7 @@ target_include_directories(react_render_uimanager PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_render_uimanager glog - folly_futures - folly_json + folly_runtime jsi react_debug react_render_componentregistry