Allow to use crash handler code from the crashpad library #62
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gm4sl
requested changes
May 29, 2024
handler/CMakeLists.txt
Outdated
| target_include_directories(handler PUBLIC ..) | ||
| else () | ||
| add_executable(handler main.cc) | ||
| set_property(TARGET handler PROPERTY ENABLE_EXPORTS 1) |
There was a problem hiding this comment.
Shouldn't need to specify ENABLE_EXPORTS if a separate target is being generated for the static library.
handler/CMakeLists.txt
Outdated
|
|
||
| if (ANDROID) | ||
| if (CUSTOM_CRASHPAD_HANDLER_DESTINATION) |
There was a problem hiding this comment.
Should CUSTOM_CRASHPAD_HANDLER_DESTINATION be supported for the static library as well?
handler/CMakeLists.txt
Outdated
| target_compile_features(handler PUBLIC cxx_std_17) | ||
| target_include_directories(handler PRIVATE ..) | ||
| target_link_libraries(handler PRIVATE client tools compat snapshot minidump) | ||
| if (HANDLER STREQUAL "INTEGRATED") |
There was a problem hiding this comment.
Instead of having the user set a separate, likely hard to find CMake variable, maybe create the static library unconditionally, or maybe conditioned on ANDROID instead, along with a comment explaining how is intended to be used. Something like,
# Used to implement a work-around for launching the Crashpad handler stored in an APK.
if (ANDROID)
add_library(handlerlib STATIC ${CRASHPAD_HANDLER_LIBRARY_FILES})
target_compile_features(handlerlib PUBLIC cxx_std_17)
target_link_libraries(handlerlib PRIVATE client tools compat snapshot minidump)
target_include_directories(handlerlib PUBLIC ..)
endif(ANDROID)
This would require updating the name used in the backtrace-android commit:
target_link_libraries(backtrace-native handlerlib)
gm4sl
approved these changes
May 29, 2024
handler/CMakeLists.txt
Outdated
| COMMAND ${CMAKE_COMMAND} -E copy | ||
| $<TARGET_FILE:handler> | ||
| ${CUSTOM_CRASHPAD_HANDLER_DESTINATION} | ||
| COMMAND ${CMAKE_COMMAND} -E copy |
There was a problem hiding this comment.
(nit) These changes seem unnecessary in this PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why
Crashpad allows using direct methods like HandlerMain to generate a minidump and send it via Java Crash Handler. Right now, we're including crashpad handler code in the crashpad_handler.so we're unable to call methods like HandlerMain.
This change allows defining a variable that cmake can set to tell where to include handler code.
ref: BT-2852