Nicer

grendello · grendello · commit 4038bf53142e · 2024-10-16T17:48:55.000+02:00
diff --git a/tools/assembly-store-reader-mk2/AssemblyStore/StoreReader_V2.cs b/tools/assembly-store-reader-mk2/AssemblyStore/StoreReader_V2.cs
@@ -75,9 +75,7 @@ string GetArchPath (AndroidTargetArch arch, string? root = null, bool embeddedBl
 				root = LibDirName;
 			}
 			parts.Add (abi);
-			parts.Add (
-				embeddedBlob ? "libxamarin-app.so" : GetBlobName (abi)
-			);
+			parts.Add (GetBlobName (abi, embeddedBlob));
 
 			return MonoAndroidHelper.MakeZipArchivePath (root, parts);
 		}
@@ -94,7 +92,7 @@ public StoreReader_V2 (Stream store, string path)
 		};
 	}
 
-	static string GetBlobName (string abi) => $"libassemblies.{abi}.blob.so";
+	static string GetBlobName (string abi, bool embeddedBlob) => embeddedBlob ? "libxamarin-app.so" : $"libassemblies.{abi}.blob.so";
 
 	protected override ulong GetStoreStartDataOffset () => elfOffset;
 

Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,7 @@ string GetArchPath (AndroidTargetArch arch, string? root = null, bool embeddedBl`
`75`	`75`	`root = LibDirName;`
`76`	`76`	`}`
`77`	`77`	`parts.Add (abi);`
`78`		`- parts.Add (`
`79`		`- embeddedBlob ? "libxamarin-app.so" : GetBlobName (abi)`
`80`		`- );`
	`78`	`+ parts.Add (GetBlobName (abi, embeddedBlob));`
`81`	`79`
`82`	`80`	`return MonoAndroidHelper.MakeZipArchivePath (root, parts);`
`83`	`81`	`}`
`@@ -94,7 +92,7 @@ public StoreReader_V2 (Stream store, string path)`
`94`	`92`	`};`
`95`	`93`	`}`
`96`	`94`
`97`		`- static string GetBlobName (string abi) => $"libassemblies.{abi}.blob.so";`
	`95`	`+ static string GetBlobName (string abi, bool embeddedBlob) => embeddedBlob ? "libxamarin-app.so" : $"libassemblies.{abi}.blob.so";`
`98`	`96`
`99`	`97`	`protected override ulong GetStoreStartDataOffset () => elfOffset;`
`100`	`98`