Pass CLI logs to Unity in any case for Android build

src/Sentry.Unity.Editor/Android/AndroidManifestConfiguration.cs

@@ -247,7 +247,7 @@ internal void AddAndroidSdkDependencies(string gradleProjectPath)
         internal void SetupSymbolsUpload(string unityProjectPath, string gradleProjectPath)
         {
             var disableSymbolsUpload = false;
-            var symbolsUpload = new DebugSymbolUpload(_logger, _sentryCliOptions, unityProjectPath, gradleProjectPath, EditorUserBuildSettings.exportAsGoogleAndroidProject, ShouldUploadMapping());
+            var symbolsUpload = new DebugSymbolUpload(_logger, _sentryCliOptions, unityProjectPath, gradleProjectPath, EditorUserBuildSettings.exportAsGoogleAndroidProject, AndroidUtils.ShouldUploadMapping());
 
             if (_options is not { Enabled: true, AndroidNativeSupportEnabled: true })
             {
@@ -330,34 +330,7 @@ internal static string GetManifestPath(string basePath) =>
                 .Append("AndroidManifest.xml")
                 .ToString();
 
-        private bool ShouldUploadMapping()
-        {
-            var isDebug = EditorUserBuildSettings.development;
-            var majorVersion = int.Parse(Application.unityVersion.Split('.')[0]);
-            if (majorVersion < 2020)
-            {
-                var buildSettingsType = typeof(EditorUserBuildSettings);
-                var propertyName = isDebug ? "androidDebugMinification" : "androidReleaseMinification";
-                var prop = buildSettingsType.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Static);
-                if (prop != null)
-                {
-                    var value = (int)prop.GetValue(null);
-                    return value > 0;
-                }
-            }
-            else
-            {
-                var type = typeof(PlayerSettings.Android);
-                var propertyName = isDebug ? "minifyDebug" : "minifyRelease";
-                var prop = type.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Static);
-                if (prop != null)
-                {
-                    return (bool)prop.GetValue(null);
-                }
-            }
 
-            return false;
-        }
     }
 
     internal class AndroidXmlDocument : XmlDocument

src/Sentry.Unity.Editor/Android/AndroidUtils.cs

@@ -0,0 +1,38 @@
+using System.Reflection;
+using UnityEditor;
+using UnityEngine;
+
+namespace Sentry.Unity.Editor.Android
+{
+    internal static class AndroidUtils
+    {
+        internal static bool ShouldUploadMapping()
+        {
+            var isDebug = EditorUserBuildSettings.development;
+            var majorVersion = int.Parse(Application.unityVersion.Split('.')[0]);
+            if (majorVersion < 2020)
+            {
+                var buildSettingsType = typeof(EditorUserBuildSettings);
+                var propertyName = isDebug ? "androidDebugMinification" : "androidReleaseMinification";
+                var prop = buildSettingsType.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Static);
+                if (prop != null)
+                {
+                    var value = (int)prop.GetValue(null);
+                    return value > 0;
+                }
+            }
+            else
+            {
+                var type = typeof(PlayerSettings.Android);
+                var propertyName = isDebug ? "minifyDebug" : "minifyRelease";
+                var prop = type.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Static);
+                if (prop != null)
+                {
+                    return (bool)prop.GetValue(null);
+                }
+            }
+
+            return false;
+        }
+    }
+}

src/Sentry.Unity.Editor/Android/PostBuildCheck.cs

@@ -60,23 +60,40 @@ internal void CheckUploadTaskResult()
             }
 
             var unityProjectPath = projectDir.FullName;
+            CheckUploadSymbolLogs(unityProjectPath);
+            CheckUploadMappingLogs(unityProjectPath);
+        }
+
+        private void CheckUploadSymbolLogs(string unityProjectPath)
+        {
             var symbolUploadLogPath = Path.Combine(unityProjectPath, "Logs", DebugSymbolUpload.SymbolUploadLogName);
-            if (HasError(symbolUploadLogPath, out var symbolError, out var symbolLog))
+            var hasSymbolError = HasError(symbolUploadLogPath, out var symbolError, out var symbolLog);
+            if (hasSymbolError)
             {
                 _logger.LogWarning($"Symbol upload task error: {symbolError}");
-                _logger.LogWarning("Symbol upload log file content:");
-                LogFileContent(symbolLog);
-                File.WriteAllText(symbolUploadLogPath, symbolLog); // Clean up the log file
+            }
+
+            LogFileContent("Symbol upload log file content:", symbolLog, hasSymbolError);
+            File.WriteAllText(symbolUploadLogPath, symbolLog); // Clean up the log file
+        }
+
+        private void CheckUploadMappingLogs(string unityProjectPath)
+        {
+            if (!AndroidUtils.ShouldUploadMapping())
+            {
+                _logger.LogDebug("Minification is disabled. Will not check upload mapping task result.");
+                return;
             }
 
             var mappingUploadLogPath = Path.Combine(unityProjectPath, "Logs", DebugSymbolUpload.MappingUploadLogName);
-            if (HasError(mappingUploadLogPath, out var mappingError, out var mappingLog))
+            var hasMappingError = HasError(mappingUploadLogPath, out var mappingError, out var mappingLog);
+            if (hasMappingError)
             {
                 _logger.LogWarning($"Mapping upload task error: {mappingError}");
-                _logger.LogWarning("Mapping upload log file content:");
-                LogFileContent(mappingLog);
-                File.WriteAllText(mappingUploadLogPath, mappingLog); // Clean up the log file
             }
+
+            LogFileContent("Mapping upload log file content:", mappingLog, hasMappingError);
+            File.WriteAllText(mappingUploadLogPath, mappingLog); // Clean up the log file
         }
 
         private bool HasError(string filePath, out string error, out string fileContent)
@@ -91,6 +108,7 @@ private bool HasError(string filePath, out string error, out string fileContent)
             var text = File.ReadAllText(filePath);
             if (!text.Contains(errorMarker))
             {
+                fileContent = text;
                 return false;
             }
 
@@ -105,19 +123,33 @@ private bool HasError(string filePath, out string error, out string fileContent)
             return !string.IsNullOrEmpty(error);
         }
 
-        private void LogFileContent(string fileContent)
+        private void LogFileContent(string title, string fileContent, bool hasError)
         {
+            var logFunction = new Action<string>(message =>
+            {
+                if (hasError)
+                {
+                    Debug.LogWarning(message);
+                }
+                else
+                {
+                    Debug.Log(message);
+                }
+            });
+
+            logFunction(title);
+
             const int maxLogLength = 8192;
             if (fileContent.Length < maxLogLength)
             {
-                Debug.LogWarning(fileContent);
+                logFunction(fileContent);
                 return;
             }
 
             for (var i = 0; i < fileContent.Length; i += maxLogLength)
             {
                 var chunkLength = maxLogLength + i > fileContent.Length ? fileContent.Length - i : maxLogLength;
-                Debug.LogWarning(fileContent.Substring(i, chunkLength));
+                logFunction(fileContent.Substring(i, chunkLength));
             }
         }
     }