Skip to content

Commit e5874d9

Browse files
Andrei Shikovfacebook-github-bot
Andrei Shikov
authored and
facebook-github-bot
committed
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
1 parent 9e7d91f commit e5874d9

File tree

35 files changed

+55
-72
lines changed

35 files changed

+55
-72
lines changed

‎ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ target_link_libraries(
3434
jsireact
3535
fb
3636
fbjni
37-
folly_json
37+
folly_runtime
3838
hermes-engine::libhermes
3939
jsi
4040
reactnativejni

‎ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ target_include_directories(mapbufferjni
2323
target_link_libraries(mapbufferjni
2424
fb
2525
fbjni
26-
folly_futures
27-
folly_json
26+
folly_runtime
2827
glog
2928
glog_init
3029
react_debug

‎ReactAndroid/src/main/java/com/facebook/react/jscexecutor/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ target_link_libraries(jscexecutor
1818
jscruntime
1919
fb
2020
fbjni
21-
folly_json
21+
folly_runtime
2222
jsi
2323
reactnativejni)

‎ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ target_link_libraries(reactnativeblob
1717
jsireact
1818
fb
1919
fbjni
20-
folly_json
20+
folly_runtime
2121
jsi
2222
reactnativejni)

‎ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ target_include_directories(uimanagerjni PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
1616
target_link_libraries(uimanagerjni
1717
fb
1818
fbjni
19-
folly_futures
20-
folly_json
19+
folly_runtime
2120
glog
2221
glog_init
2322
rrc_native

‎ReactAndroid/src/main/jni/react/jni/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ target_link_libraries(reactnativeutilsjni
3434
callinvokerholder
3535
fb
3636
fbjni
37-
folly_json
37+
folly_runtime
3838
glog_init
3939
react_render_runtimescheduler
4040
reactnative
@@ -61,7 +61,7 @@ target_link_libraries(reactnativejni
6161
callinvokerholder
6262
fb
6363
fbjni
64-
folly_json
64+
folly_runtime
6565
glog_init
6666
logger
6767
react_render_runtimescheduler

‎ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,18 @@ SET(folly_FLAGS
1919
)
2020

2121
##################
22-
### folly_json ###
22+
### folly_runtime ###
2323
##################
2424

25-
SET(folly_json_SRC
25+
SET(folly_runtime_SRC
26+
folly/SharedMutex.cpp
27+
folly/concurrency/CacheLocality.cpp
28+
folly/detail/Futex.cpp
29+
folly/lang/SafeAssert.cpp
30+
folly/lang/ToAscii.cpp
31+
folly/synchronization/ParkingLot.cpp
32+
folly/system/ThreadId.cpp
33+
folly/system/ThreadName.cpp
2634
folly/json.cpp
2735
folly/Unicode.cpp
2836
folly/Conv.cpp
@@ -35,48 +43,44 @@ SET(folly_json_SRC
3543
folly/net/NetOps.cpp
3644
folly/json_pointer.cpp
3745
folly/lang/CString.cpp
38-
folly/lang/SafeAssert.cpp
3946
folly/detail/UniqueInstance.cpp
4047
folly/hash/SpookyHashV2.cpp
4148
folly/container/detail/F14Table.cpp
4249
folly/ScopeGuard.cpp
43-
folly/portability/SysUio.cpp
44-
folly/lang/ToAscii.cpp)
50+
folly/portability/SysUio.cpp)
4551

4652
IF (CMAKE_BUILD_TYPE MATCHES Debug)
47-
list(APPEND folly_json_SRC folly/lang/Assume.cpp)
53+
list(APPEND folly_runtime_SRC folly/lang/Assume.cpp)
4854
ENDIF ()
4955

50-
add_library(folly_json SHARED ${folly_json_SRC})
56+
add_library(folly_runtime SHARED ${folly_runtime_SRC})
5157

52-
target_compile_options(folly_json
58+
target_compile_options(folly_runtime
5359
PRIVATE
5460
-fexceptions
5561
-fno-omit-frame-pointer
5662
-frtti
5763
-Wno-sign-compare
5864
${folly_FLAGS})
5965

60-
target_compile_options(folly_json PUBLIC ${folly_FLAGS})
66+
target_compile_options(folly_runtime PUBLIC ${folly_FLAGS})
6167

62-
target_include_directories(folly_json PUBLIC .)
63-
target_link_libraries(folly_json glog double-conversion boost fmt)
68+
target_include_directories(folly_runtime PUBLIC .)
69+
target_link_libraries(folly_runtime glog double-conversion boost fmt)
6470

6571
#####################
6672
### folly_futures ###
6773
#####################
6874

69-
add_library(folly_futures SHARED
75+
add_library(folly_futures STATIC
7076
folly/ExceptionWrapper.cpp
7177
folly/ExceptionString.cpp
7278
folly/Executor.cpp
73-
folly/SharedMutex.cpp
7479
folly/Singleton.cpp
7580
folly/Try.cpp
7681
folly/concurrency/CacheLocality.cpp
7782
folly/detail/AsyncTrace.cpp
7883
folly/detail/AtFork.cpp
79-
folly/detail/Futex.cpp
8084
folly/detail/MemoryIdler.cpp
8185
folly/detail/SingletonStackTrace.cpp
8286
folly/detail/StaticSingletonManager.cpp
@@ -106,12 +110,9 @@ add_library(folly_futures SHARED
106110
folly/portability/SysMembarrier.cpp
107111
folly/synchronization/AsymmetricMemoryBarrier.cpp
108112
folly/synchronization/Hazptr.cpp
109-
folly/synchronization/ParkingLot.cpp
110113
folly/synchronization/WaitOptions.cpp
111114
folly/synchronization/detail/Sleeper.cpp
112-
folly/system/Pid.cpp
113-
folly/system/ThreadId.cpp
114-
folly/system/ThreadName.cpp)
115+
folly/system/Pid.cpp)
115116

116117
target_compile_options(folly_futures
117118
PRIVATE
@@ -122,4 +123,4 @@ target_compile_options(folly_futures
122123
-Wno-unused-variable)
123124

124125
target_include_directories(folly_futures PUBLIC .)
125-
target_link_libraries(folly_futures glog double-conversion folly_json boost event fmt)
126+
target_link_libraries(folly_futures glog double-conversion folly_runtime boost event fmt)

‎ReactCommon/cxxreact/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ target_include_directories(reactnative PUBLIC ${REACT_COMMON_DIR})
2020
target_link_libraries(reactnative
2121
boost
2222
callinvoker
23-
folly_json
23+
folly_runtime
2424
glog
2525
jsi
2626
jsinspector

‎ReactCommon/hermes/inspector/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ target_link_libraries(hermes-inspector
2626
fb
2727
fbjni
2828
folly_futures
29-
folly_json
29+
folly_runtime
3030
glog
3131
hermes-engine::libhermes
3232
jsi)

‎ReactCommon/jsi/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ add_library(jsi SHARED ${jsi_SRC})
2323
target_include_directories(jsi PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
2424

2525
target_link_libraries(jsi
26-
folly_json
26+
folly_runtime
2727
glog)
2828

2929
##################
@@ -36,7 +36,7 @@ add_library(jscruntime STATIC
3636

3737
target_include_directories(jscruntime PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
3838

39-
target_link_libraries(jscruntime folly_json jsc glog)
39+
target_link_libraries(jscruntime folly_runtime jsc glog)
4040

4141
# TODO: Remove this flag when ready.
4242
# Android has this enabled by default, but the flag is still needed for iOS.

0 commit comments

Comments
 (0)