Skip to content

Commit 839c757

Browse files
committed
Bump to xamarin/Java.Interop/master@c19794e6
Changes: dotnet/java-interop@80b4667...c19794e * dotnet/java-interop@c19794e: [build] Support building with JetBrains OpenJDK 11 (#629) * dotnet/java-interop@6d7266d: [crc64] Change the hash prefix back to `crc64` (#628) * dotnet/java-interop@7fe3a11: [crc64] Fix a subtle bug in CRC64 splice-by-8 implementation (#627) * dotnet/java-interop@9b88ce7: [performance] Improve speed of our CRC-64 hasher (#624) * dotnet/java-interop@1032c0e: [Java.Interop.Tools.Cecil] Change DirectoryAssemblyResolver Warning to Diagnostic Output (#622) * dotnet/java-interop@93df5a2: [generator] simplify life with 'var' in generated code (#621) Various `.csproj` files updated to deal with changes from dotnet/java-interop@9b88ce79, which added a new `Crc64.Table.cs` file and requires use of C# unsafe code. Bump the expected size of `apk-Release-Bundle`, because dotnet/java-interop@9b88ce7 increased the size of `Mono.Android.dll`.
1 parent 75dc590 commit 839c757

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

external/Java.Interop

src/Mono.Android/Mono.Android.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
<Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers\Crc64.cs">
9393
<Link>Crc64.cs</Link>
9494
</Compile>
95+
<Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers\Crc64.Table.cs">
96+
<Link>Crc64.Table.cs</Link>
97+
</Compile>
9598
<Compile Include="Android.Runtime\DynamicMethodNameCounter.cs" />
9699
<Compile Include="Android.Runtime\IJavaObjectValueMarshaler.cs" />
97100
</ItemGroup>

src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<LibZipSharpBundleAllNativeLibraries>true</LibZipSharpBundleAllNativeLibraries>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
7+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
78
</PropertyGroup>
89

910
<Import Project="..\..\Configuration.props" />
@@ -24,6 +25,9 @@
2425
<Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers\Crc64.cs">
2526
<Link>Crc64.cs</Link>
2627
</Compile>
28+
<Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers\Crc64.Table.cs">
29+
<Link>Crc64.Table.cs</Link>
30+
</Compile>
2731
</ItemGroup>
2832

2933
<ItemGroup>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
apk-Release,Java.Interop.dll-Release,Mono.Android.dll-Release,mscorlib.dll-Release,monosgen-armeabi-v7a-Release,apk-Release-Aot,Java.Interop.dll-Release-Aot,Mono.Android.dll-Release-Aot,mscorlib.dll-Release-Aot,monosgen-armeabi-v7a-Release-Aot,mscorlib.dll.so-Release-Aot,Java.Interop.dll.so-Release-Aot,Mono.Android.dll.so-Release-Aot,apk-Release-Profiled-Aot,Java.Interop.dll-Release-Profiled-Aot,Mono.Android.dll-Release-Profiled-Aot,mscorlib.dll-Release-Profiled-Aot,monosgen-armeabi-v7a-Release-Profiled-Aot,mscorlib.dll.so-Release-Profiled-Aot,Java.Interop.dll.so-Release-Profiled-Aot,Mono.Android.dll.so-Release-Profiled-Aot,apk-Release-Bundle,monosgen-armeabi-v7a-Release-Bundle
2-
21060829,164352,2270720,2106368,3812068,47431203,164352,2270720,2106368,3812068,8410472,868516,9869872,25308707,164352,2270720,2106368,3812068,2046988,300664,789624,15923084,3812068
2+
21060829,164352,2270720,2106368,3812068,47431203,164352,2270720,2106368,3812068,8410472,868516,9869872,25308707,164352,2270720,2106368,3812068,2046988,300664,789624,16037772,3812068

0 commit comments

Comments
 (0)