Skip to content

Commit bcc900a

Browse files
committed
Refactor configuration of REACT_NATIVE_DEBUGGER_ENABLED C++ flag
1 parent 9221772 commit bcc900a

3 files changed

Lines changed: 8 additions & 13 deletions

File tree

packages/react-native/ReactCommon/cmake-utils/react-native-flags.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,11 @@ function(target_compile_reactnative_options target_name scope)
3232
if(ANDROID)
3333
target_compile_definitions(${target_name} ${scope} RN_SERIALIZABLE_STATE)
3434
endif()
35+
if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
36+
# We enable REACT_NATIVE_DEBUGGER_ENABLED for Debug builds on the whole codebase.
37+
target_compile_options(${target_name} PRIVATE
38+
-DREACT_NATIVE_DEBUGGER_ENABLED=1
39+
-DREACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1
40+
)
41+
endif ()
3542
endfunction()

packages/react-native/ReactCommon/jsinspector-modern/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,4 @@ target_link_libraries(jsinspector
2929
react_utils
3030
)
3131
target_compile_reactnative_options(jsinspector PRIVATE)
32-
if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
33-
target_compile_options(jsinspector PRIVATE
34-
-DREACT_NATIVE_DEBUGGER_ENABLED=1
35-
-DREACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1
36-
)
37-
endif ()
32+

packages/react-native/ReactCommon/react/networking/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,3 @@ target_link_libraries(react_networking
2121
jsinspector_tracing
2222
react_performance_timeline
2323
react_timing)
24-
25-
if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
26-
target_compile_options(react_networking PRIVATE
27-
-DREACT_NATIVE_DEBUGGER_ENABLED=1
28-
-DREACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1
29-
)
30-
endif ()

0 commit comments

Comments
 (0)