From d0c28214cf539216447ff93db5e84e57101b13ec Mon Sep 17 00:00:00 2001
From: Ivan Tustanivskyi <tustanivsky@gmail.com>
Date: Fri, 13 Mar 2026 09:54:51 +0200
Subject: [PATCH 1/6] Fix build errors for Android Shipping target

---
 plugin-dev/Source/Sentry/Sentry_Android_UPL.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
index acbdb2b97..e1b2d1558 100644
--- a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
+++ b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
@@ -62,6 +62,7 @@
     <proguardAdditions>
         <insert>
             -dontwarn android.app.ApplicationStartInfo
+            -dontwarn com.abovevacant.epitaph.**
             -dontwarn io.sentry.unreal.**
             -keep class io.sentry.** { *; }
             -keep interface io.sentry.** { *; }

From 8996f02235c621de46927ea1c6966bd86fb1d749 Mon Sep 17 00:00:00 2001
From: Ivan Tustanivskyi <tustanivsky@gmail.com>
Date: Fri, 13 Mar 2026 12:48:05 +0200
Subject: [PATCH 2/6] Replace `protobuf-javalite` with `epitaph `

---
 plugin-dev/Source/Sentry/Sentry_Android_UPL.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
index e1b2d1558..76d59e829 100644
--- a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
+++ b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
@@ -62,7 +62,6 @@
     <proguardAdditions>
         <insert>
             -dontwarn android.app.ApplicationStartInfo
-            -dontwarn com.abovevacant.epitaph.**
             -dontwarn io.sentry.unreal.**
             -keep class io.sentry.** { *; }
             -keep interface io.sentry.** { *; }
@@ -114,7 +113,7 @@
 
             dependencies {
                 implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'])
-                implementation "com.google.protobuf:protobuf-javalite:3.25.8"
+                implementation "com.abovevacant:epitaph:0.1.0"
             }
 
             repositories {

From b8b0c6e10ce3be365b77fe8d1afadbca72555922 Mon Sep 17 00:00:00 2001
From: Ivan Tustanivskyi <tustanivsky@gmail.com>
Date: Fri, 13 Mar 2026 14:02:34 +0200
Subject: [PATCH 3/6] Skip jetifier procession for epitaph lib

---
 plugin-dev/Source/Sentry/Sentry_Android_UPL.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
index 76d59e829..ad868db6f 100644
--- a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
+++ b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
@@ -56,6 +56,7 @@
         <insert>
             android.useAndroidX=true
             android.enableJetifier=true
+            android.jetifier.ignorelist=epitaph
         </insert>
     </gradleProperties>
 

From 79fdc859bc32cebaaa31f1c9c5ba6073aa14d4d0 Mon Sep 17 00:00:00 2001
From: Ivan Tustanivskyi <tustanivsky@gmail.com>
Date: Fri, 13 Mar 2026 19:47:57 +0200
Subject: [PATCH 4/6] Try newer AGP

---
 .../Source/Sentry/Sentry_Android_UPL.xml      | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
index ad868db6f..25f43ffb3 100644
--- a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
+++ b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
@@ -156,6 +156,22 @@
     </baseBuildGradleAdditions>
 
     <buildscriptGradleAdditions>
+        <if condition="bUseLegacyGradlePlugin">
+            <true>
+                <insert>
+                    dependencies {
+                        classpath 'com.android.tools.build:gradle:3.5.4'
+                    }
+                </insert>
+            </true>
+            <false>
+                <insert>
+                    dependencies {
+                        classpath 'com.android.tools.build:gradle:8.5.2'
+                    }
+                </insert>
+            </false>
+        </if>
         <if condition="bUploadSymbols">
             <true>
                 <if condition="bUseLegacyGradlePlugin">
@@ -163,17 +179,14 @@
                         <log text="Using legacy Sentry Gradle plugin for Android debug symbol upload."/>
                         <insert>
                             dependencies {
-                                classpath 'com.android.tools.build:gradle:3.5.4'
                                 classpath 'io.sentry:sentry-android-gradle-plugin:2.1.5' // legacy
                             }
                         </insert>
                     </true>
                     <false>
                         <log text="Using Sentry Gradle plugin for Android debug symbol upload."/>
-                        <log text="Enable legacy Sentry Gradle plugin in project settings in case current version conflicts with other plugins (for UE 5.4 and older)."/>
                         <insert>
                             dependencies {
-                                classpath 'com.android.tools.build:gradle:7.4.2'
                                 classpath 'io.sentry:sentry-android-gradle-plugin:6.1.0' // current
                             }
                         </insert>

From ac949755414d79000ea5ad37a3b67e6f7af02f3c Mon Sep 17 00:00:00 2001
From: Ivan Tustanivskyi <tustanivsky@gmail.com>
Date: Fri, 13 Mar 2026 20:22:53 +0200
Subject: [PATCH 5/6] Force AIDL

---
 plugin-dev/Source/Sentry/Sentry_Android_UPL.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
index 25f43ffb3..fea879b58 100644
--- a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
+++ b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
@@ -110,6 +110,9 @@
                     targetCompatibility JavaVersion.VERSION_1_8
                     sourceCompatibility JavaVersion.VERSION_1_8
                 }
+                buildFeatures {
+                    aidl true
+                }
             }
 
             dependencies {

From dd90a356ce4dc21044da1c756338284c2d99599d Mon Sep 17 00:00:00 2001
From: Ivan Tustanivskyi <tustanivsky@gmail.com>
Date: Fri, 13 Mar 2026 20:53:35 +0200
Subject: [PATCH 6/6] Test

---
 plugin-dev/Source/Sentry/Sentry_Android_UPL.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
index fea879b58..6bdca9205 100644
--- a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
+++ b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
@@ -34,14 +34,14 @@
             <true>
                 <copyFile src="$S(ProjectDir)/sentry.properties" dst="$S(BuildDir)/gradle/sentry.properties" />
                 <copyFile src="$S(ProjectDir)/sentry.properties" dst="$S(BuildDir)/gradle/AFSProject/app/sentry.properties" />
-                <if condition="bUseLegacyGradlePlugin">
-                    <false>
-                        <log text="Modifying engine's Gradle version used by replacing gradle-wrapper.properties"/>
-                        <copyFile src="$S(PluginDir)/../../Gradle/gradle-wrapper.properties" dst="$S(BuildDir)/gradle/gradle/wrapper/gradle-wrapper.properties" />
-                    </false>
-                </if>
             </true>
         </if>
+        <if condition="bUseLegacyGradlePlugin">
+            <false>
+                <log text="Modifying engine's Gradle version used by replacing gradle-wrapper.properties"/>
+                <copyFile src="$S(PluginDir)/../../Gradle/gradle-wrapper.properties" dst="$S(BuildDir)/gradle/gradle/wrapper/gradle-wrapper.properties" />
+            </false>
+        </if>
     </prebuildCopies>
 
     <androidManifestUpdates>
@@ -170,7 +170,7 @@
             <false>
                 <insert>
                     dependencies {
-                        classpath 'com.android.tools.build:gradle:8.5.2'
+                        classpath 'com.android.tools.build:gradle:7.4.2'
                     }
                 </insert>
             </false>