[TrimmableTypeMap] Drop Crc64Helper scanner changes

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: simonrozsival

src/Microsoft.Android.Sdk.TrimmableTypeMap/Microsoft.Android.Sdk.TrimmableTypeMap.csproj

@@ -5,7 +5,6 @@
     <TargetFramework>$(TargetFrameworkNETStandard)</TargetFramework>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>Nullable</WarningsAsErrors>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <RootNamespace>Microsoft.Android.Sdk.TrimmableTypeMap</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
@@ -19,8 +18,6 @@
 
   <ItemGroup>
     <Compile Include="..\..\src-ThirdParty\System.Runtime.CompilerServices\CompilerFeaturePolyfills.cs" Link="CompilerFeaturePolyfills.cs" />
-    <Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers\Crc64Helper.cs" Link="Crc64Helper.cs" />
-    <Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers\Crc64.Table.cs" Link="Crc64.Table.cs" />
   </ItemGroup>
 
 </Project>

src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs

@@ -6,8 +6,6 @@
 using System.Reflection.Metadata;
 using System.Reflection.Metadata.Ecma335;
 using System.Reflection.PortableExecutable;
-using Java.Interop.Tools.JavaCallableWrappers;
-
 namespace Microsoft.Android.Sdk.TrimmableTypeMap;
 
 /// <summary>
@@ -1474,11 +1472,8 @@ static string GetCrc64PackageName (string ns, string assemblyName)
 			return ns.ToLowerInvariant ().Replace ('.', '/');
 		}
 
-		// Keep this in sync with JavaNativeTypeManager.ToJniName(Type)/(TypeDefinition).
-		// The trimmable build path must emit the exact same CRC64 package names that the
-		// runtime later computes for FindClass(Type) and peer activation.
 		var data = System.Text.Encoding.UTF8.GetBytes ($"{ns}:{assemblyName}");
-		var hash = Crc64Helper.Compute (data);
+		var hash = System.IO.Hashing.Crc64.Hash (data);
 		return $"crc64{BitConverter.ToString (hash).Replace ("-", "").ToLowerInvariant ()}";
 	}
 

tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Scanner/JavaPeerScannerTests.cs

@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using Java.Interop.Tools.JavaCallableWrappers;
 using Xunit;
 
 namespace Microsoft.Android.Sdk.TrimmableTypeMap.Tests;
@@ -90,28 +86,4 @@ public void Scan_RegisterAttribute_DotFormat_NormalizedToSlashes ()
 		Assert.False (peer.DoNotGenerateAcw);
 		Assert.True (peer.IsUnconditional, "Should be unconditional due to [Activity]");
 	}
-
-	[Theory]
-	[InlineData ("MyApp.PlainActivitySubclass")]
-	[InlineData ("MyApp.UnregisteredClickListener")]
-	[InlineData ("MyApp.UnregisteredExporter")]
-	public void Scan_UnregisteredType_MatchesJavaNativeTypeManager (string managedName)
-	{
-		var testAssemblyDir = Path.GetDirectoryName (typeof (FixtureTestBase).Assembly.Location)
-			?? throw new InvalidOperationException ("Cannot determine test assembly directory");
-		var fixtureAssemblyPath = Path.Combine (testAssemblyDir, "TestFixtures.dll");
-		var fixtureAssembly = Assembly.LoadFrom (fixtureAssemblyPath);
-		var fixtureType = fixtureAssembly.GetType (managedName);
-		if (fixtureType is null) {
-			throw new InvalidOperationException ($"Could not load fixture type '{managedName}' from '{fixtureAssemblyPath}'.");
-		}
-
-		var assemblyName = fixtureType.Assembly.GetName ().Name
-			?? throw new InvalidOperationException ($"Could not determine assembly name for '{managedName}'.");
-		var data = Encoding.UTF8.GetBytes ($"{fixtureType.Namespace}:{assemblyName}");
-		var hash = Crc64Helper.Compute (data);
-		var expectedJavaName = $"crc64{BitConverter.ToString (hash).Replace ("-", "").ToLowerInvariant ()}/{fixtureType.Name}";
-
-		Assert.Equal (expectedJavaName, FindFixtureByManagedName (managedName).JavaName);
-	}
 }