Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a447b63

Browse files
tustanivskytustanivsky
authoredMar 5, 2025··
Remove Native SDK build from source in Unreal (#808)
* Remove Native SDK module * Update CI workflow * Update package snapshot * Update download scripts * Update gitignore * Fix CI * Update changelog
1 parent c6d85b2 commit a447b63

File tree

11 files changed

+30
-6011
lines changed

11 files changed

+30
-6011
lines changed
 

‎.github/workflows/ci.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,8 @@ jobs:
4848
target: Win64-Breakpad
4949
runsOn: windows-2019
5050

51-
native-sdk:
52-
uses: ./.github/workflows/native-sdk-download.yml
53-
with:
54-
target: Native
55-
runsOn: ubuntu-latest
56-
5751
build:
58-
needs: [android-sdk, ios-sdk, macos-sdk, linux-sdk, linux-arm64-sdk, windows-crashpad-sdk, windows-breakpad-sdk, native-sdk]
52+
needs: [android-sdk, ios-sdk, macos-sdk, linux-sdk, linux-arm64-sdk, windows-crashpad-sdk, windows-breakpad-sdk]
5953
name: Package
6054
runs-on: ubuntu-latest
6155
steps:
@@ -103,11 +97,6 @@ jobs:
10397
name: Win64-Breakpad-sdk
10498
path: plugin-dev/Source/ThirdParty/Win64/Breakpad
10599

106-
- uses: actions/download-artifact@v4
107-
with:
108-
name: Native-sdk
109-
path: plugin-dev/Source/ThirdParty/Native/sentry-native
110-
111100
- name: Prepare Sentry packages for release
112101
shell: pwsh
113102
run: ./scripts/packaging/pack.ps1
@@ -120,8 +109,6 @@ jobs:
120109
if-no-files-found: error
121110
path: |
122111
sentry-unreal-*.zip
123-
# Adding the native libraries so the symbol collector craft target can find/upload them
124-
# TODO modules/sentry-java/sentry-android-ndk/build/intermediates/merged_native_libs/release/out/lib/*
125112
126113
package-validation:
127114
needs: [build]

‎.github/workflows/native-sdk-download.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ plugin-dev/Source/ThirdParty/Linux
3333
plugin-dev/Source/ThirdParty/LinuxArm64
3434
plugin-dev/Source/ThirdParty/Mac
3535
plugin-dev/Source/ThirdParty/Win64
36-
plugin-dev/Source/ThirdParty/Native/*
37-
!plugin-dev/Source/ThirdParty/Native/.gitkeep
38-
!plugin-dev/Source/ThirdParty/Native/SentryNativeSource.Build.cs
3936
plugin-dev/Source/ThirdParty/CLI/*
4037
!plugin-dev/Source/ThirdParty/.gitkeep
4138
!plugin-dev/Source/ThirdParty/CLI/.gitkeep

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### Breaking Changes
6+
7+
- Remove Native SDK build from source in Unreal ([#808](https://github.com/getsentry/sentry-unreal/pull/808))
8+
39
## 1.0.0-alpha.2
410

511
### Dependencies

‎plugin-dev/Source/Sentry/Sentry.Build.cs

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
public class Sentry : ModuleRules
1919
{
20-
[CommandLine("-buildNativeForWindows")]
21-
public bool bBuildNativeForWindows = false;
22-
2320
public Sentry(ReadOnlyTargetRules Target) : base(Target)
2421
{
2522
PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
@@ -93,38 +90,31 @@ public Sentry(ReadOnlyTargetRules Target) : base(Target)
9390
{
9491
PrivateIncludePaths.Add(Path.Combine(ModuleDirectory, "Private", "Microsoft"));
9592

96-
if (bBuildNativeForWindows)
93+
bool CrashpadExists = File.Exists(Path.Combine(PlatformThirdPartyPath, "Crashpad", "bin", "crashpad_handler.exe"));
94+
95+
string WindowsThirdPartyPath = Path.Combine(PlatformThirdPartyPath, CrashpadExists ? "Crashpad" : "Breakpad");
96+
97+
PublicIncludePaths.Add(Path.Combine(WindowsThirdPartyPath, "include"));
98+
99+
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "sentry.lib"));
100+
101+
if (CrashpadExists)
97102
{
98-
PrivateDependencyModuleNames.Add("SentryNativeSource");
103+
RuntimeDependencies.Add(Path.Combine(PlatformBinariesPath, "crashpad_handler.exe"), Path.Combine(WindowsThirdPartyPath, "bin", "crashpad_handler.exe"));
104+
105+
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_compat.lib"));
106+
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_snapshot.lib"));
107+
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_util.lib"));
108+
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "mini_chromium.lib"));
109+
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_client.lib"));
110+
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_zlib.lib"));
111+
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_getopt.lib"));
112+
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_tools.lib"));
113+
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_handler_lib.lib"));
99114
}
100115
else
101116
{
102-
bool CrashpadExists = File.Exists(Path.Combine(PlatformThirdPartyPath, "Crashpad", "bin", "crashpad_handler.exe"));
103-
104-
string WindowsThirdPartyPath = Path.Combine(PlatformThirdPartyPath, CrashpadExists ? "Crashpad" : "Breakpad");
105-
106-
PublicIncludePaths.Add(Path.Combine(WindowsThirdPartyPath, "include"));
107-
108-
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "sentry.lib"));
109-
110-
if (CrashpadExists)
111-
{
112-
RuntimeDependencies.Add(Path.Combine(PlatformBinariesPath, "crashpad_handler.exe"), Path.Combine(WindowsThirdPartyPath, "bin", "crashpad_handler.exe"));
113-
114-
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_compat.lib"));
115-
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_snapshot.lib"));
116-
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_util.lib"));
117-
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "mini_chromium.lib"));
118-
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_client.lib"));
119-
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_zlib.lib"));
120-
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_getopt.lib"));
121-
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_tools.lib"));
122-
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_handler_lib.lib"));
123-
}
124-
else
125-
{
126-
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "breakpad_client.lib"));
127-
}
117+
PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "breakpad_client.lib"));
128118
}
129119

130120
PublicDefinitions.Add("USE_SENTRY_NATIVE=1");

‎plugin-dev/Source/ThirdParty/Native/.gitkeep

Whitespace-only changes.

‎plugin-dev/Source/ThirdParty/Native/SentryNativeSource.Build.cs

Lines changed: 0 additions & 453 deletions
This file was deleted.

‎scripts/download-sdks.ps1

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if (-not (Test-Path $outDir))
3434
New-Item $outDir -ItemType Directory > $null
3535
}
3636

37-
$sdks = @("Android", "IOS", "Linux", "LinuxArm64", "Mac", "Win64-Crashpad", "Win64-Breakpad", "Native")
37+
$sdks = @("Android", "IOS", "Linux", "LinuxArm64", "Mac", "Win64-Crashpad", "Win64-Breakpad")
3838
foreach ($sdk in $sdks)
3939
{
4040
$sdkDir = "$outDir/$sdk"
@@ -43,12 +43,7 @@ foreach ($sdk in $sdks)
4343
{
4444
$winSdk, $crashBackend = $sdk.Split("-")
4545
$sdkDir = "$outDir/$winSdk/$crashBackend"
46-
}
47-
48-
if ($sdk.StartsWith('Native'))
49-
{
50-
$sdkDir = "$outDir/$sdk/sentry-native"
51-
}
46+
}
5247

5348
Write-Host "Downloading $sdk SDK to $sdkDir ..."
5449
if (Test-Path $sdkDir)

‎scripts/download-sdks.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,3 @@ for winSdk in "${winSdks[@]}"; do
3737
echo "Downloading Win64-$winSdk SDK to $PWD/Win64/$winSdk ..."
3838
gh run download $runId -n "Win64-$winSdk-sdk" -D Win64/$winSdk
3939
done
40-
41-
rm -rf "./Native/sentry-native"
42-
echo "Downloading Native SDK to $PWD/Native/sentry-native ..."
43-
gh run download $runId -n "Native-sdk" -D Native/sentry-native

‎scripts/packaging/package-github.snapshot

Lines changed: 0 additions & 2726 deletions
Large diffs are not rendered by default.

‎scripts/packaging/package-marketplace.snapshot

Lines changed: 0 additions & 2726 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.