Skip to content

Commit 64e99c3

Browse files
jonpryorjonpryor
authored
Bump to xamarin/Java.Interop/master@c19794e6 (dotnet#4569)
Changes: dotnet/java-interop@80b4667...c19794e * dotnet/java-interop@c19794e: [build] Support building with JetBrains OpenJDK 11 (dotnet#629) * dotnet/java-interop@6d7266d: [crc64] Change the hash prefix back to `crc64` (dotnet#628) * dotnet/java-interop@7fe3a11: [crc64] Fix a subtle bug in CRC64 splice-by-8 implementation (dotnet#627) * dotnet/java-interop@9b88ce7: [performance] Improve speed of our CRC-64 hasher (dotnet#624) * dotnet/java-interop@1032c0e: [Java.Interop.Tools.Cecil] Change DirectoryAssemblyResolver Warning to Diagnostic Output (dotnet#622) * dotnet/java-interop@93df5a2: [generator] simplify life with 'var' in generated code (dotnet#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 sizes of `.apk` files, as dotnet/java-interop@9b88ce7 increased the size of `Mono.Android.dll`.
1 parent 24f7bbf commit 64e99c3

8 files changed

+37
-30
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>

‎tests/apk-sizes-reference/TestResult-Xamarin.Forms_Tests-values-Release.csv

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

‎tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Aot.apkdesc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"Comment": null,
33
"Entries": {
44
"AndroidManifest.xml": {
5-
"Size": 3684
5+
"Size": 3664
66
},
77
"res/anim/abc_fade_in.xml": {
88
"Size": 388
@@ -2831,7 +2831,7 @@
28312831
"Size": 157
28322832
},
28332833
"classes.dex": {
2834-
"Size": 1944832
2834+
"Size": 2200624
28352835
},
28362836
"assemblies/Xamarin.Forms.Performance.Integration.Droid.dll": {
28372837
"Size": 183808
@@ -2981,7 +2981,7 @@
29812981
"Size": 164864
29822982
},
29832983
"assemblies/Mono.Android.dll": {
2984-
"Size": 2242048
2984+
"Size": 2256896
29852985
},
29862986
"assemblies/mscorlib.dll": {
29872987
"Size": 2090496
@@ -2990,7 +2990,7 @@
29902990
"Size": 389632
29912991
},
29922992
"assemblies/System.dll": {
2993-
"Size": 873984
2993+
"Size": 874496
29942994
},
29952995
"assemblies/System.Net.Http.dll": {
29962996
"Size": 218112
@@ -3059,7 +3059,7 @@
30593059
"Size": 8640
30603060
},
30613061
"lib/armeabi-v7a/libaot-System.dll.so": {
3062-
"Size": 3969392
3062+
"Size": 3970892
30633063
},
30643064
"lib/armeabi-v7a/libaot-Xamarin.Forms.Performance.Integration.Droid.dll.so": {
30653065
"Size": 179420
@@ -3206,7 +3206,7 @@
32063206
"Size": 443052
32073207
},
32083208
"lib/armeabi-v7a/libaot-Mono.Android.dll.so": {
3209-
"Size": 10474332
3209+
"Size": 10478660
32103210
},
32113211
"lib/armeabi-v7a/libaot-System.Xml.Linq.dll.so": {
32123212
"Size": 328340
@@ -3215,7 +3215,7 @@
32153215
"Size": 13224
32163216
},
32173217
"lib/armeabi-v7a/libaot-System.Numerics.dll.so": {
3218-
"Size": 161396
3218+
"Size": 161492
32193219
},
32203220
"lib/armeabi-v7a/libaot-System.Runtime.Serialization.dll.so": {
32213221
"Size": 2204344
@@ -3272,7 +3272,7 @@
32723272
"Size": 3283644
32733273
},
32743274
"lib/x86/libaot-System.dll.so": {
3275-
"Size": 3822632
3275+
"Size": 3824092
32763276
},
32773277
"lib/x86/libaot-System.Xml.dll.so": {
32783278
"Size": 5696184
@@ -3341,7 +3341,7 @@
33413341
"Size": 112356
33423342
},
33433343
"lib/x86/libaot-Mono.Android.dll.so": {
3344-
"Size": 9818752
3344+
"Size": 9818980
33453345
},
33463346
"lib/x86/libaot-Xamarin.Android.Support.v7.MediaRouter.dll.so": {
33473347
"Size": 8336
@@ -3380,7 +3380,7 @@
33803380
"Size": 466968
33813381
},
33823382
"lib/x86/libaot-System.Numerics.dll.so": {
3383-
"Size": 155612
3383+
"Size": 155712
33843384
},
33853385
"lib/x86/libaot-Xamarin.Android.Support.v7.RecyclerView.dll.so": {
33863386
"Size": 2380252
@@ -3542,5 +3542,5 @@
35423542
"Size": 122473
35433543
}
35443544
},
3545-
"PackageSize": 47332899
3545+
"PackageSize": 47455779
35463546
}

‎tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Bundle.apkdesc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"Comment": null,
33
"Entries": {
44
"AndroidManifest.xml": {
5-
"Size": 3684
5+
"Size": 3664
66
},
77
"res/anim/abc_fade_in.xml": {
88
"Size": 388
@@ -2831,7 +2831,7 @@
28312831
"Size": 157
28322832
},
28332833
"classes.dex": {
2834-
"Size": 1944832
2834+
"Size": 2200624
28352835
},
28362836
"lib/armeabi-v7a/libmonodroid.so": {
28372837
"Size": 170812
@@ -2861,13 +2861,13 @@
28612861
"Size": 714476
28622862
},
28632863
"lib/armeabi-v7a/libmonodroid_bundle_app.so": {
2864-
"Size": 4578964
2864+
"Size": 4595348
28652865
},
28662866
"lib/x86/libmono-native.so": {
28672867
"Size": 788196
28682868
},
28692869
"lib/x86/libmonodroid_bundle_app.so": {
2870-
"Size": 4578600
2870+
"Size": 4594984
28712871
},
28722872
"META-INF/proguard/androidx-annotations.pro": {
28732873
"Size": 308
@@ -2990,5 +2990,5 @@
29902990
"Size": 103018
29912991
}
29922992
},
2993-
"PackageSize": 15898508
2993+
"PackageSize": 16037772
29942994
}

‎tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Profiled-Aot.apkdesc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"Comment": null,
33
"Entries": {
44
"AndroidManifest.xml": {
5-
"Size": 3684
5+
"Size": 3664
66
},
77
"res/anim/abc_fade_in.xml": {
88
"Size": 388
@@ -2831,7 +2831,7 @@
28312831
"Size": 157
28322832
},
28332833
"classes.dex": {
2834-
"Size": 1944832
2834+
"Size": 2200624
28352835
},
28362836
"assemblies/Xamarin.Forms.Performance.Integration.Droid.dll": {
28372837
"Size": 183808
@@ -2981,7 +2981,7 @@
29812981
"Size": 164864
29822982
},
29832983
"assemblies/Mono.Android.dll": {
2984-
"Size": 2242048
2984+
"Size": 2256896
29852985
},
29862986
"assemblies/mscorlib.dll": {
29872987
"Size": 2090496
@@ -2990,7 +2990,7 @@
29902990
"Size": 389632
29912991
},
29922992
"assemblies/System.dll": {
2993-
"Size": 873984
2993+
"Size": 874496
29942994
},
29952995
"assemblies/System.Net.Http.dll": {
29962996
"Size": 218112
@@ -3080,7 +3080,7 @@
30803080
"Size": 6492
30813081
},
30823082
"lib/armeabi-v7a/libaot-Mono.Android.dll.so": {
3083-
"Size": 952924
3083+
"Size": 950768
30843084
},
30853085
"lib/armeabi-v7a/libaot-Plugin.Connectivity.Abstractions.dll.so": {
30863086
"Size": 6492
@@ -3245,7 +3245,7 @@
32453245
"Size": 283880
32463246
},
32473247
"lib/x86/libaot-Mono.Android.dll.so": {
3248-
"Size": 781968
3248+
"Size": 779856
32493249
},
32503250
"lib/x86/libaot-Xamarin.Forms.Performance.Integration.Droid.dll.so": {
32513251
"Size": 6288
@@ -3542,5 +3542,5 @@
35423542
"Size": 122473
35433543
}
35443544
},
3545-
"PackageSize": 25247267
3545+
"PackageSize": 25366051
35463546
}

‎tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release.apkdesc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"Comment": null,
33
"Entries": {
44
"AndroidManifest.xml": {
5-
"Size": 3684
5+
"Size": 3664
66
},
77
"res/anim/abc_fade_in.xml": {
88
"Size": 388
@@ -2831,7 +2831,7 @@
28312831
"Size": 157
28322832
},
28332833
"classes.dex": {
2834-
"Size": 1944832
2834+
"Size": 2200624
28352835
},
28362836
"assemblies/Xamarin.Forms.Performance.Integration.Droid.dll": {
28372837
"Size": 183808
@@ -2981,7 +2981,7 @@
29812981
"Size": 164864
29822982
},
29832983
"assemblies/Mono.Android.dll": {
2984-
"Size": 2242048
2984+
"Size": 2256896
29852985
},
29862986
"assemblies/mscorlib.dll": {
29872987
"Size": 2090496
@@ -2990,7 +2990,7 @@
29902990
"Size": 389632
29912991
},
29922992
"assemblies/System.dll": {
2993-
"Size": 873984
2993+
"Size": 874496
29942994
},
29952995
"assemblies/System.Net.Http.dll": {
29962996
"Size": 218112
@@ -3170,5 +3170,5 @@
31703170
"Size": 108895
31713171
}
31723172
},
3173-
"PackageSize": 21007581
3173+
"PackageSize": 21130461
31743174
}

0 commit comments

Comments
 (0)