fix: No symbols in release mode on android workloads 10.0.102 and later (#4998)

* fix: Android apps not symbolicating in release mode

* Changelog

Author: jamescrosswell

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixes
 
 - The SDK now logs a `Warning` instead of an `Error` when being ratelimited ([#4927](https://github.com/getsentry/sentry-dotnet/pull/4927))
+- Symbolication now works correctly with Android workloads 10.0.102 and later ([#4998](https://github.com/getsentry/sentry-dotnet/pull/4998))
 - `libmonosgen` and `libxamarin` frames no longer show as in-app ([#4960](https://github.com/getsentry/sentry-dotnet/pull/4960))
 
 ## 6.2.0-alpha.0

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
     "version": "10.0.102",
-    "workloadVersion": "10.0.101.1",
+    "workloadVersion": "10.0.102",
     "rollForward": "disable",
     "allowPrerelease": false
   }

src/Sentry.Android.AssemblyReader/V2/StoreReader.cs

@@ -42,6 +42,10 @@ static StoreReader()
             GetArchPath (AndroidTargetArch.Arm),
             GetArchPath (AndroidTargetArch.X86_64),
             GetArchPath (AndroidTargetArch.X86),
+            GetArchPath (AndroidTargetArch.Arm64, newBlobName: true),
+            GetArchPath (AndroidTargetArch.Arm, newBlobName: true),
+            GetArchPath (AndroidTargetArch.X86_64, newBlobName: true),
+            GetArchPath (AndroidTargetArch.X86, newBlobName: true),
         };
         ApkPaths = paths.AsReadOnly();
         AabBasePaths = ApkPaths;
@@ -52,10 +56,14 @@ static StoreReader()
             GetArchPath (AndroidTargetArch.Arm, AabBaseDir),
             GetArchPath (AndroidTargetArch.X86_64, AabBaseDir),
             GetArchPath (AndroidTargetArch.X86, AabBaseDir),
+            GetArchPath (AndroidTargetArch.Arm64, AabBaseDir, true),
+            GetArchPath (AndroidTargetArch.Arm, AabBaseDir, true),
+            GetArchPath (AndroidTargetArch.X86_64, AabBaseDir, true),
+            GetArchPath (AndroidTargetArch.X86, AabBaseDir, true),
         };
         AabPaths = paths.AsReadOnly();
 
-        string GetArchPath(AndroidTargetArch arch, string? root = null)
+        string GetArchPath(AndroidTargetArch arch, string? root = null, bool newBlobName = false)
         {
             const string LibDirName = "lib";
 
@@ -70,7 +78,7 @@ string GetArchPath(AndroidTargetArch arch, string? root = null)
                 root = LibDirName;
             }
             parts.Add(abi);
-            parts.Add(GetBlobName(abi));
+            parts.Add(newBlobName ? NewBlobName : GetOldBlobName(abi));
 
             return MonoAndroidHelper.MakeZipArchivePath(root, parts);
         }
@@ -87,7 +95,16 @@ public StoreReader(Stream store, string path, DebugLogger? logger)
         };
     }
 
-    private static string GetBlobName(string abi) => $"libassemblies.{abi}.blob.so";
+    /// <summary>
+    /// This method returns the expected blob name for a given ABI for dotnet/android workload versions 10.0.101.1 and earlier
+    /// </summary>
+    private static string GetOldBlobName(string abi) => $"libassemblies.{abi}.blob.so";
+
+    /// <summary>
+    /// More recent versions of the dotnet/android workload (starting with 10.0.102) switched to a single blob name for
+    /// all ABIs. See: https://github.com/dotnet/android/pull/10638
+    /// </summary>
+    private const string NewBlobName = "libassembly-store.so";
 
     protected override ulong GetStoreStartDataOffset() => elfOffset;