birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SPEC-6071][Crashpad] Make Crashpad available through 3rdParty system for Windows

Browse Source
This commit is contained in:
junbo
2021-04-19 22:38:33 -07:00
parent 17997b3df8
commit eb0758f63a
14 changed files with 16 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/CryEngine/CrySystem/CMakeLists.txt
+1
View File
@@ -60,6 +60,7 @@ ly_add_target(
Legacy::CrySystem.XMLBinary
Legacy::RemoteConsoleCore
AZ::AzFramework
AZ::CrashHandler
RUNTIME_DEPENDENCIES
Legacy::Cry3DEngine
)
Code/Sandbox/Editor/CMakeLists.txt
+1
View File
@@ -125,6 +125,7 @@ ly_add_target(
Gem::Atom_RPI.Public
Gem::Atom_Feature_Common.Static
Gem::AtomToolsFramework.Static
AZ::ToolsCrashHandler
${additional_dependencies}
PUBLIC
3rdParty::AWSNativeSDK::Core
Code/Tools/AssetProcessor/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ ly_add_target(
AZ::AzQtComponents
AZ::AzToolsFramework
AZ::AssetBuilderSDK
AZ::ToolsCrashHandler
${additional_dependencies}
RUNTIME_DEPENDENCIES
AZ::AssetBuilder
Code/Tools/CMakeLists.txt
+1 -1
View File
@@ -13,6 +13,7 @@ add_subdirectory(SceneAPI) # Needs to go before AssetProcessor since it provides
add_subdirectory(AssetProcessor)
add_subdirectory(AWSNativeSDKInit)
add_subdirectory(AzTestRunner)
add_subdirectory(CrashHandler)
add_subdirectory(CryCommonTools)
add_subdirectory(CryXML)
add_subdirectory(HLSLCrossCompiler)
@@ -21,7 +22,6 @@ add_subdirectory(News)
add_subdirectory(PythonBindingsExample)
add_subdirectory(RC)
add_subdirectory(RemoteConsole)
add_subdirectory(CrashHandler)
add_subdirectory(ShaderCacheGen)
add_subdirectory(DeltaCataloger)
add_subdirectory(SerializeContextTools)
Code/Tools/CrashHandler/CMakeLists.txt
+3 -5
View File
@@ -32,11 +32,11 @@ ly_add_target(
PRIVATE
${pal_dir}
BUILD_DEPENDENCIES
PUBLIC
AZ::CrashSupport
PRIVATE
3rdParty::Crashpad
AZ::AzCore
AZ::AzFramework
AZ::CrashSupport
)
string(REPLACE "." ";" version_list "${LY_VERSION_STRING}")
@@ -67,11 +67,9 @@ ly_add_target(
PRIVATE
Uploader/include/Uploader
BUILD_DEPENDENCIES
PRIVATE
AZ::AzCore
AZ::CrashSupport
PUBLIC
3rdParty::Crashpad::Handler
AZ::CrashSupport
)
add_subdirectory(Tools)
Code/Tools/CrashHandler/Support/CMakeLists.txt
+1 -1
View File
@@ -19,6 +19,6 @@ ly_add_target(
PUBLIC
include
BUILD_DEPENDENCIES
PRIVATE
PUBLIC
AZ::AzCore
)
Code/Tools/CrashHandler/Tools/CMakeLists.txt
+3 -7
View File
@@ -21,13 +21,13 @@ ly_add_target(
tools_crash_handler_files.cmake
Platform/${PAL_PLATFORM_NAME}/tools_crash_handler_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
INCLUDE_DIRECTORIES
PRIVATE
PUBLIC
.
BUILD_DEPENDENCIES
PUBLIC
AZ::CrashHandler
PRIVATE
3rdParty::Qt::Core
AZ::CrashHandler
AZ::CrashSupport
AZ::AzToolsFramework
)
@@ -41,18 +41,14 @@ ly_add_target(
Platform/${PAL_PLATFORM_NAME}/tools_crash_uploader_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
INCLUDE_DIRECTORIES
PRIVATE
.
Uploader
BUILD_DEPENDENCIES
PRIVATE
3rdParty::Qt::Core
3rdParty::Qt::Gui
3rdParty::Qt::Widgets
3rdParty::Crashpad
3rdParty::Crashpad::Handler
AZ::CrashUploaderSupport
AZ::AzQtComponents
AZ::CrashSupport
TARGET_PROPERTIES
Qt5_NO_LINK_QTMAIN TRUE
)
Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp
+3 -3
View File
@@ -138,7 +138,7 @@ namespace O3de
if (!logFileReader->Open(thisFile))
{
#if defined(AZ_PLATFORM_WINDOWS)
LOG(ERROR) << "Failed to open " << base::UTF16ToUTF8(thisFile.BaseName().value());
LOG(ERROR) << "Failed to open " << base::WideToUTF8(thisFile.BaseName().value());
#else
LOG(ERROR) << "Failed to open " << thisFile.BaseName().value();
#endif
@@ -149,7 +149,7 @@ namespace O3de
if (start_offset < 0)
{
#if defined(AZ_PLATFORM_WINDOWS)
LOG(ERROR) << "Failed to get offset for " << base::UTF16ToUTF8(thisFile.BaseName().value());
LOG(ERROR) << "Failed to get offset for " << base::WideToUTF8(thisFile.BaseName().value());
#else
LOG(ERROR) << "Failed to get offset for " << thisFile.BaseName().value();
#endif
@@ -162,7 +162,7 @@ namespace O3de
std::string fileNameKey{ "attachment_" };
#if defined(AZ_PLATFORM_WINDOWS)
fileNameKey += base::UTF16ToUTF8(thisFile.BaseName().value());
fileNameKey += base::WideToUTF8(thisFile.BaseName().value());
#else
fileNameKey += thisFile.BaseName().value();
#endif
Code/Tools/Standalone/CMakeLists.txt
+1
View File
@@ -36,6 +36,7 @@ ly_add_target(
AZ::AzToolsFramework
AZ::GridMate
AZ::AzQtComponents
AZ::ToolsCrashHandler
${additional_dependencies}
COMPILE_DEFINITIONS
PRIVATE
Gems/CrashReporting/Code/CMakeLists.txt
-7
View File
@@ -30,9 +30,7 @@ ly_add_target(
Include
BUILD_DEPENDENCIES
PRIVATE
AZ::AzCore
AZ::CrashHandler
AZ::CrashSupport
)
ly_add_target(
@@ -46,10 +44,5 @@ ly_add_target(
Include
BUILD_DEPENDENCIES
PRIVATE
#3rdParty::Crashpad
#3rdParty::Crashpad::Handler
AZ::AzCore
AZ::CrashUploaderSupport
#AZ::CrashHandler
AZ::CrashSupport
)
cmake/3rdParty/FindCrashpad.cmake
Vendored
-30
View File
@@ -1,30 +0,0 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#
ly_add_external_target(
NAME Crashpad
VERSION ""
3RDPARTY_ROOT_DIRECTORY ${LY_ROOT_FOLDER}/Tools/Crashpad
INCLUDE_DIRECTORIES
include
include/third_party/mini_chromium/mini_chromium/
)
ly_add_external_target(
NAME Handler
PACKAGE Crashpad
VERSION ""
3RDPARTY_ROOT_DIRECTORY ${LY_ROOT_FOLDER}/Tools/Crashpad
INCLUDE_DIRECTORIES
include
include/third_party/mini_chromium/mini_chromium
include/third_party/getopt
)
cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
Vendored
+1
View File
@@ -56,3 +56,4 @@ ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-windows TARGETS lib
ly_associate_package(PACKAGE_NAME OpenMesh-8.1-rev1-windows TARGETS OpenMesh PACKAGE_HASH 1c1df639358526c368e790dfce40c45cbdfcfb1c9a041b9d7054a8949d88ee77)
ly_associate_package(PACKAGE_NAME civetweb-1.8-rev1-windows TARGETS civetweb PACKAGE_HASH 36d0e58a59bcdb4dd70493fb1b177aa0354c945b06c30416348fd326cf323dd4)
ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev2-windows TARGETS OpenSSL PACKAGE_HASH 9af1c50343f89146b4053101a7aeb20513319a3fe2f007e356d7ce25f9241040)
ly_associate_package(PACKAGE_NAME Crashpad-0.8.0-windows TARGETS Crashpad PACKAGE_HASH 6a6ae2d1c5bbc2083823c2a8a0a7c01b88ee47261c64e529e14c1f83f3436de2)
cmake/3rdParty/Platform/Windows/Crashpad_windows.cmake
Vendored
-36
View File
@@ -1,36 +0,0 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#
set(libpath ${BASE_PATH}/bin/windows/vs2019/$<IF:$<CONFIG:debug>,Debug,Release>_x64)
set(CRASHPAD_LIBS
${libpath}/base.lib
${libpath}/crashpad_client.lib
${libpath}/crashpad_context.lib
${libpath}/crashpad_util.lib
winhttp
version
powrprof
)
set(CRASHPAD_INCLUDE_DIRECTORIES
include/compat/win
)
set(CRASHPAD_HANDLER_LIBS
${libpath}/crashpad_tool_support.lib
${libpath}/crashpad_compat.lib
${libpath}/third_party/getopt.lib
${libpath}/crashpad_minidump.lib
${libpath}/crashpad_snapshot.lib
${libpath}/crashpad_handler.lib
${libpath}/third_party/zlib.lib
)
cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
Vendored
-1
View File
@@ -11,7 +11,6 @@
set(FILES
BuiltInPackages_windows.cmake
Crashpad_windows.cmake
dyad_windows.cmake
FbxSdk_windows.cmake
libav_windows.cmake