backtrace-labs · melekr · Aug 15, 2025 · Aug 15, 2025 · Aug 15, 2025 · Aug 15, 2025
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -49,3 +49,4 @@ jobs:
           targetPlatform: ${{ matrix.targetPlatform }}
           projectPath: ${{ matrix.projectPath }}/
           allowDirtyBuild: true
+
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,9 +18,10 @@ jobs:
         projectPath:
           - test-package
         unityVersion:
-          - 2022.3.19f1
-          - 2019.4.40f1
-          - 2020.3.48f1
+          # Pending LTS License
+          #- 2021.3.48f1
+          #- 6000.0.38f1
+          - 2022.3.56f1
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

diff --git a/Android/lib/arm64-v8a/libbacktrace-native.so b/Android/lib/arm64-v8a/libbacktrace-native.so
diff --git a/Android/lib/arm64-v8a/libbacktrace-native.so.meta b/Android/lib/arm64-v8a/libbacktrace-native.so.meta
diff --git a/Android/lib/arm64-v8a/libcrashpad_handler.so b/Android/lib/arm64-v8a/libcrashpad_handler.so
diff --git a/Android/lib/arm64-v8a/libnative-lib.so b/Android/lib/arm64-v8a/libnative-lib.so
diff --git a/Android/lib/arm64-v8a/libnative-lib.so.meta b/Android/lib/arm64-v8a/libnative-lib.so.meta
diff --git a/Android/lib/armeabi-v7a/libbacktrace-native.so b/Android/lib/armeabi-v7a/libbacktrace-native.so
diff --git a/Android/lib/armeabi-v7a/libbacktrace-native.so.meta b/Android/lib/armeabi-v7a/libbacktrace-native.so.meta
diff --git a/Android/lib/armeabi-v7a/libcrashpad_handler.so b/Android/lib/armeabi-v7a/libcrashpad_handler.so
diff --git a/Android/lib/armeabi-v7a/libcrashpad_handler.so.meta b/Android/lib/armeabi-v7a/libcrashpad_handler.so.meta
diff --git a/Android/lib/armeabi-v7a/libnative-lib.so b/Android/lib/armeabi-v7a/libnative-lib.so
diff --git a/Android/lib/armeabi-v7a/libnative-lib.so.meta b/Android/lib/armeabi-v7a/libnative-lib.so.meta
diff --git a/Android/lib/x86/libbacktrace-native.so b/Android/lib/x86/libbacktrace-native.so
diff --git a/Android/lib/x86/libbacktrace-native.so.meta b/Android/lib/x86/libbacktrace-native.so.meta
diff --git a/Android/lib/x86/libcrashpad_handler.so b/Android/lib/x86/libcrashpad_handler.so
diff --git a/Android/lib/x86/libnative-lib.so b/Android/lib/x86/libnative-lib.so
diff --git a/Android/lib/x86_64.meta b/Android/lib/x86_64.meta
diff --git a/Android/lib/x86_64/libbacktrace-native.so b/Android/lib/x86_64/libbacktrace-native.so
diff --git a/Android/lib/x86/libcrashpad_handler.so.meta → ...id/lib/x86_64/libbacktrace-native.so.meta b/Android/lib/x86/libcrashpad_handler.so.meta → ...id/lib/x86_64/libbacktrace-native.so.meta
diff --git a/Android/lib/x86_64/libnative-lib.so b/Android/lib/x86_64/libnative-lib.so
diff --git a/...lib/arm64-v8a/libcrashpad_handler.so.meta → Android/lib/x86_64/libnative-lib.so.meta b/...lib/arm64-v8a/libcrashpad_handler.so.meta → Android/lib/x86_64/libnative-lib.so.meta
diff --git a/Runtime/Native/Android/NativeClient.cs b/Runtime/Native/Android/NativeClient.cs
@@ -22,8 +22,6 @@ namespace Backtrace.Unity.Runtime.Native.Android
     internal sealed class NativeClient : NativeClientBase, INativeClient
     {
         private const string CallbackMethodName = "OnAnrDetected";
-        [DllImport("backtrace-native")]
-        private static extern bool Initialize(IntPtr submissionUrl, IntPtr databasePath, IntPtr handlerPath, IntPtr keys, IntPtr values, IntPtr attachments, bool enableClientSideUnwinding, int unwindingMode);
 
         [DllImport("backtrace-native")]
         private static extern bool InitializeJavaCrashHandler(IntPtr submissionUrl, IntPtr databasePath, IntPtr classPath, IntPtr keys, IntPtr values, IntPtr attachments, IntPtr environmentVariables);
@@ -86,11 +84,6 @@ private void SetDefaultAttributeMaps()
         // Unity-Android native interface path
         private const string _namespace = "backtraceio.unity";
 
-        /// <summary>
-        /// unwinding mode
-        /// </summary>
-        private UnwindingMode UnwindingMode = UnwindingMode.LOCAL_DUMPWITHOUTCRASH;
-
         /// <summary>
         /// Path to class responsible for detecting ANRs occurred by Java code.
         /// </summary>
@@ -131,7 +124,6 @@ private void SetDefaultAttributeMaps()
         /// </summary>
         private AndroidJavaObject _unhandledExceptionWatcher;
 
-        private readonly bool _enableClientSideUnwinding = false;
         public string GameObjectName { get; internal set; }
         public NativeClient(BacktraceConfiguration configuration, BacktraceBreadcrumbs breadcrumbs, IDictionary<string, string> clientAttributes, IEnumerable<string> attachments, string gameObjectName) : base(configuration, breadcrumbs)
         {
@@ -141,9 +133,7 @@ public NativeClient(BacktraceConfiguration configuration, BacktraceBreadcrumbs b
             {
                 return;
             }
-#if UNITY_2019_2_OR_NEWER
-            _enableClientSideUnwinding = _configuration.ClientSideUnwinding;
-#endif
+
             HandlerANR = _configuration.HandleANR;
             HandleNativeCrashes(clientAttributes, attachments);
             if (!configuration.ReportFilterType.HasFlag(Types.ReportFilterType.Hang))
@@ -246,8 +236,16 @@ private void HandleNativeCrashes(IDictionary<string, string> backtraceAttributes
                 Debug.LogWarning("Backtrace native integration status: Disabled NDK integration");
                 return;
             }
+
             var databasePath = _configuration.CrashpadDatabasePath;
-            if (string.IsNullOrEmpty(databasePath) || !Directory.Exists(_configuration.GetFullDatabasePath()))
+            var fullDatabasePath = _configuration.GetFullDatabasePath();
+
+            if (string.IsNullOrEmpty(databasePath) || string.IsNullOrEmpty(fullDatabasePath))
+            {
+                Debug.LogWarning("Backtrace native integration status: database path undefined");
+                return;
+            }
+            if (!Directory.Exists(fullDatabasePath))
             {
                 Debug.LogWarning("Backtrace native integration status: database path doesn't exist");
                 return;
@@ -261,6 +259,7 @@ private void HandleNativeCrashes(IDictionary<string, string> backtraceAttributes
             int apiLevel;
             if (apiLevelString == null || !int.TryParse(apiLevelString, out apiLevel))
             {
+                Debug.LogWarning("Backtrace native integration status: Cannot determine Android API level");
                 return;
             }
 
@@ -275,25 +274,29 @@ private void HandleNativeCrashes(IDictionary<string, string> backtraceAttributes
 
             var minidumpUrl = new BacktraceCredentials(_configuration.GetValidServerUrl()).GetMinidumpSubmissionUrl().ToString();
 
+            // Resolve native library directory
             var libDirectory = GetNativeDirectoryPath();
             if (string.IsNullOrEmpty(libDirectory) || !Directory.Exists(libDirectory))
             {
                 libDirectory = GuessNativeDirectoryPath();
             }
-            const string crashpadHandlerName = "libcrashpad_handler.so";
-            var crashpadHandlerPath = Path.Combine(libDirectory, crashpadHandlerName);
 
-            CaptureNativeCrashes = CanInitializeExecutableCrashHandler(libDirectory, crashpadHandlerPath)
-                ? InitializeExecutableCrashHandler(minidumpUrl, databasePath, crashpadHandlerPath, attachments)
-                : InitializeJavaCrashHandler(minidumpUrl, databasePath, backtraceAttributes["device.abi"], libDirectory, attachments);
+            if (string.IsNullOrEmpty(libDirectory) || !Directory.Exists(libDirectory))
+            {
+                Debug.LogWarning("Backtrace native integration status: Cannot resolve native library directory");
+                return;
+            }
 
+            CaptureNativeCrashes = InitializeJavaCrashHandler(minidumpUrl, databasePath, backtraceAttributes["device.abi"], libDirectory, attachments);
+
             if (!CaptureNativeCrashes)
             {
-                Debug.LogWarning("Backtrace native integration status: Cannot initialize Crashpad client");
+                Debug.LogWarning("Backtrace native integration status: Cannot initialize Java crash handler");
                 return;
             }
+
             foreach (var attribute in backtraceAttributes)
-            {
+            {   
                 AddAttribute(AndroidJNI.NewStringUTF(attribute.Key), AndroidJNI.NewStringUTF(attribute.Value));
             }
 
@@ -305,25 +308,7 @@ private void HandleNativeCrashes(IDictionary<string, string> backtraceAttributes
             // don't add attributes that can change over the time to initialization method attributes. Crashpad will prevent from 
             // overriding them on game runtime. ANRs/OOMs methods can override error.type attribute, so we shouldn't pass error.type 
             // attribute via attributes parameters.
-            AddAttribute(
-                        AndroidJNI.NewStringUTF(ErrorTypeAttribute),
-                        AndroidJNI.NewStringUTF(CrashType));
-        }
-
-        private bool CanInitializeExecutableCrashHandler(String nativeLibraryDirectory, String handlerPath) {
-            return Directory.Exists(nativeLibraryDirectory) && File.Exists(handlerPath);
-        }
-
-        private bool InitializeExecutableCrashHandler(String minidumpUrl, String databasePath, String crashpadHandlerPath, IEnumerable<String> attachments) {
-            return Initialize(
-                AndroidJNI.NewStringUTF(minidumpUrl),
-                AndroidJNI.NewStringUTF(databasePath),
-                AndroidJNI.NewStringUTF(crashpadHandlerPath),
-                AndroidJNIHelper.ConvertToJNIArray(new string[0]),
-                AndroidJNIHelper.ConvertToJNIArray(new string[0]),
-                AndroidJNIHelper.ConvertToJNIArray(attachments.ToArray()),
-                _enableClientSideUnwinding,
-                (int)UnwindingMode);
+            AddAttribute(AndroidJNI.NewStringUTF(ErrorTypeAttribute), AndroidJNI.NewStringUTF(CrashType));
         }
 
         private bool InitializeJavaCrashHandler(String minidumpUrl, String databasePath, String deviceAbi, String nativeDirectory, IEnumerable<String> attachments) {
@@ -361,9 +346,9 @@ private bool InitializeJavaCrashHandler(String minidumpUrl, String databasePath,
                 AndroidJNI.NewStringUTF(minidumpUrl),
                 AndroidJNI.NewStringUTF(databasePath),
                 AndroidJNI.NewStringUTF(_crashHandlerPath),
-                AndroidJNIHelper.ConvertToJNIArray(new string[0]),
-                AndroidJNIHelper.ConvertToJNIArray(new string[0]),
-                AndroidJNIHelper.ConvertToJNIArray(attachments.ToArray()),
+                AndroidJNIHelper.ConvertToJNIArray(Array.Empty<string>()),
+                AndroidJNIHelper.ConvertToJNIArray(Array.Empty<string>()),
+                AndroidJNIHelper.ConvertToJNIArray(attachments?.ToArray() ?? Array.Empty<string>()),
                 AndroidJNIHelper.ConvertToJNIArray(environmentVariables.ToArray())
             );
         }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,3 +49,4 @@ jobs:
		targetPlatform: ${{ matrix.targetPlatform }}
		projectPath: ${{ matrix.projectPath }}/
		allowDirtyBuild: true