From 29b3224eec750f0b3a8e4e8a6a6d1b45dbab8c95 Mon Sep 17 00:00:00 2001
From: Lars Toenning <dev@ltoenning.de>
Date: Wed, 11 Dec 2024 16:05:48 +0100
Subject: [PATCH] refactor: Disable crashpad

---
 CMakeLists.txt                               |  1 -
 CMakePresets.json                            |  6 +--
 cmake/crashpad/CMakeLists.txt                | 51 --------------------
 installer/installbuilder/swift-externals.xml | 10 ----
 4 files changed, 3 insertions(+), 65 deletions(-)
 delete mode 100644 cmake/crashpad/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f51952679..b9a158fba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,7 +140,6 @@ add_subdirectory(cmake/vatsimauth)
 add_subdirectory(cmake/dbus)
 add_subdirectory(cmake/sodium)
 add_subdirectory(cmake/opus)
-add_subdirectory(cmake/crashpad)
 add_subdirectory(cmake/simconnect)
 add_subdirectory(cmake/dplay)
 add_subdirectory(third_party)
diff --git a/CMakePresets.json b/CMakePresets.json
index 6f4c5ba7b..c08ecf203 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -7,7 +7,7 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "SWIFT_MINIFY_DEBUG_SYMBOLS": "ON",
-        "SWIFT_USE_CRASHPAD": "ON",
+        "SWIFT_USE_CRASHPAD": "OFF",
         "SWIFT_BUILD_SAMPLES": "OFF",
         "VATSIM_KEY_JSON": "vatsim.json",
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/dist"
@@ -24,7 +24,7 @@
         "rhs": "Windows"
       },
       "cacheVariables": {
-        "SWIFT_USE_CRASHPAD": "ON"
+        "SWIFT_USE_CRASHPAD": "OFF"
       }
     },
     {
@@ -38,7 +38,7 @@
         "rhs": "Darwin"
       },
       "cacheVariables": {
-        "SWIFT_USE_CRASHPAD": "ON"
+        "SWIFT_USE_CRASHPAD": "OFF"
       }
     },
     {
diff --git a/cmake/crashpad/CMakeLists.txt b/cmake/crashpad/CMakeLists.txt
deleted file mode 100644
index da66aa6f4..000000000
--- a/cmake/crashpad/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors
-# SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-add_library(externals_crashpad INTERFACE)
-target_include_directories(externals_crashpad INTERFACE
-    ${PROJECT_SOURCE_DIR}/third_party/externals/common/include
-    ${PROJECT_SOURCE_DIR}/third_party/externals/common/include/crashpad
-    ${PROJECT_SOURCE_DIR}/third_party/externals/common/include/crashpad/mini_chromium
-)
-
-if(SWIFT_WIN32)
-    if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-        target_link_libraries(externals_crashpad INTERFACE
-            ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/based.lib
-            ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/clientd.lib
-            ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/utild.lib
-        )
-    else()
-        target_link_libraries(externals_crashpad INTERFACE
-            ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/base.lib
-            ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/client.lib
-            ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/util.lib
-        )
-    endif()
-elseif(SWIFT_WIN64)
-    if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-        target_link_libraries(externals_crashpad INTERFACE
-            ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/based.lib
-            ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/clientd.lib
-            ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/utild.lib
-        )
-    else()
-        target_link_libraries(externals_crashpad INTERFACE
-            ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/base.lib
-            ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/client.lib
-            ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/util.lib
-        )
-    endif()
-elseif(APPLE)
-    target_link_libraries(externals_crashpad INTERFACE
-            ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libbase.a
-            ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libclient.a
-            ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libutil.a
-            )
-else()
-    target_link_libraries(externals_crashpad INTERFACE
-        ${PROJECT_SOURCE_DIR}/third_party/externals/linux-g++/64/lib/libbase.a
-        ${PROJECT_SOURCE_DIR}/third_party/externals/linux-g++/64/lib/libclient.a
-        ${PROJECT_SOURCE_DIR}/third_party/externals/linux-g++/64/lib/libutil.a
-    )
-endif()
diff --git a/installer/installbuilder/swift-externals.xml b/installer/installbuilder/swift-externals.xml
index a99b041d9..4f325de46 100644
--- a/installer/installbuilder/swift-externals.xml
+++ b/installer/installbuilder/swift-externals.xml
@@ -36,10 +36,6 @@
                     <allowWildcards>1</allowWildcards>
                     <origin>../../dist/bin/*opus*.dll</origin>
                 </distributionFile>
-                <distributionFile>
-                    <allowWildcards>1</allowWildcards>
-                    <origin>../../dist/bin/*swift_crashpad_handler.exe</origin>
-                </distributionFile>
                 <distributionFile>
                     <allowWildcards>1</allowWildcards>
                     <origin>../../dist/bin/*7za.exe</origin>
@@ -52,9 +48,6 @@
             <name>bin_linux</name>
             <platforms>linux linux-x64</platforms>
             <distributionFileList>
-                <distributionFile>
-                    <origin>../../dist/bin/swift_crashpad_handler</origin>
-                </distributionFile>
             </distributionFileList>
         </folder>
         <folder>
@@ -63,9 +56,6 @@
             <name>bin_osx</name>
             <platforms>osx</platforms>
             <distributionFileList>
-                <distributionFile>
-                    <origin>../../dist/bin/swift_crashpad_handler</origin>
-                </distributionFile>
                 <distributionFile>
                     <origin>../../dist/bin/7za</origin>
                 </distributionFile>