diff --git a/external/Java.Interop b/external/Java.Interop
index 80b4667f708..c19794e67cc 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 80b4667f7085027d66592a0c36490d9488c7ce60
+Subproject commit c19794e67cc4f87aac9c64f7ceb94cfbe556c63c
diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj
index cff8166ca55..769b1c8da50 100644
--- a/src/Mono.Android/Mono.Android.csproj
+++ b/src/Mono.Android/Mono.Android.csproj
@@ -92,6 +92,9 @@
Crc64.cs
+
+ Crc64.Table.cs
+
diff --git a/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj b/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj
index 38a731b7eec..a703e0b4db9 100644
--- a/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj
+++ b/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj
@@ -4,6 +4,7 @@
netstandard2.0
true
false
+ true
@@ -24,6 +25,9 @@
Crc64.cs
+
+ Crc64.Table.cs
+
diff --git a/tests/apk-sizes-reference/TestResult-Xamarin.Forms_Tests-values-Release.csv b/tests/apk-sizes-reference/TestResult-Xamarin.Forms_Tests-values-Release.csv
index 21f54f14997..36e4030ba4d 100644
--- a/tests/apk-sizes-reference/TestResult-Xamarin.Forms_Tests-values-Release.csv
+++ b/tests/apk-sizes-reference/TestResult-Xamarin.Forms_Tests-values-Release.csv
@@ -1,2 +1,2 @@
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
-21060829,164352,2270720,2106368,3812068,47431203,164352,2270720,2106368,3812068,8410472,868516,9869872,25308707,164352,2270720,2106368,3812068,2046988,300664,789624,15923084,3812068
+21060829,164352,2270720,2106368,3812068,47431203,164352,2270720,2106368,3812068,8410472,868516,9869872,25308707,164352,2270720,2106368,3812068,2046988,300664,789624,16037772,3812068
diff --git a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Aot.apkdesc b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Aot.apkdesc
index 2f10db2a5e3..601e14ee39e 100644
--- a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Aot.apkdesc
+++ b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Aot.apkdesc
@@ -2,7 +2,7 @@
"Comment": null,
"Entries": {
"AndroidManifest.xml": {
- "Size": 3684
+ "Size": 3664
},
"res/anim/abc_fade_in.xml": {
"Size": 388
@@ -2831,7 +2831,7 @@
"Size": 157
},
"classes.dex": {
- "Size": 1944832
+ "Size": 2200624
},
"assemblies/Xamarin.Forms.Performance.Integration.Droid.dll": {
"Size": 183808
@@ -2981,7 +2981,7 @@
"Size": 164864
},
"assemblies/Mono.Android.dll": {
- "Size": 2242048
+ "Size": 2256896
},
"assemblies/mscorlib.dll": {
"Size": 2090496
@@ -2990,7 +2990,7 @@
"Size": 389632
},
"assemblies/System.dll": {
- "Size": 873984
+ "Size": 874496
},
"assemblies/System.Net.Http.dll": {
"Size": 218112
@@ -3059,7 +3059,7 @@
"Size": 8640
},
"lib/armeabi-v7a/libaot-System.dll.so": {
- "Size": 3969392
+ "Size": 3970892
},
"lib/armeabi-v7a/libaot-Xamarin.Forms.Performance.Integration.Droid.dll.so": {
"Size": 179420
@@ -3206,7 +3206,7 @@
"Size": 443052
},
"lib/armeabi-v7a/libaot-Mono.Android.dll.so": {
- "Size": 10474332
+ "Size": 10478660
},
"lib/armeabi-v7a/libaot-System.Xml.Linq.dll.so": {
"Size": 328340
@@ -3215,7 +3215,7 @@
"Size": 13224
},
"lib/armeabi-v7a/libaot-System.Numerics.dll.so": {
- "Size": 161396
+ "Size": 161492
},
"lib/armeabi-v7a/libaot-System.Runtime.Serialization.dll.so": {
"Size": 2204344
@@ -3272,7 +3272,7 @@
"Size": 3283644
},
"lib/x86/libaot-System.dll.so": {
- "Size": 3822632
+ "Size": 3824092
},
"lib/x86/libaot-System.Xml.dll.so": {
"Size": 5696184
@@ -3341,7 +3341,7 @@
"Size": 112356
},
"lib/x86/libaot-Mono.Android.dll.so": {
- "Size": 9818752
+ "Size": 9818980
},
"lib/x86/libaot-Xamarin.Android.Support.v7.MediaRouter.dll.so": {
"Size": 8336
@@ -3380,7 +3380,7 @@
"Size": 466968
},
"lib/x86/libaot-System.Numerics.dll.so": {
- "Size": 155612
+ "Size": 155712
},
"lib/x86/libaot-Xamarin.Android.Support.v7.RecyclerView.dll.so": {
"Size": 2380252
@@ -3542,5 +3542,5 @@
"Size": 122473
}
},
- "PackageSize": 47332899
+ "PackageSize": 47455779
}
\ No newline at end of file
diff --git a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Bundle.apkdesc b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Bundle.apkdesc
index 7a748faa2eb..10980137601 100644
--- a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Bundle.apkdesc
+++ b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Bundle.apkdesc
@@ -2,7 +2,7 @@
"Comment": null,
"Entries": {
"AndroidManifest.xml": {
- "Size": 3684
+ "Size": 3664
},
"res/anim/abc_fade_in.xml": {
"Size": 388
@@ -2831,7 +2831,7 @@
"Size": 157
},
"classes.dex": {
- "Size": 1944832
+ "Size": 2200624
},
"lib/armeabi-v7a/libmonodroid.so": {
"Size": 170812
@@ -2861,13 +2861,13 @@
"Size": 714476
},
"lib/armeabi-v7a/libmonodroid_bundle_app.so": {
- "Size": 4578964
+ "Size": 4595348
},
"lib/x86/libmono-native.so": {
"Size": 788196
},
"lib/x86/libmonodroid_bundle_app.so": {
- "Size": 4578600
+ "Size": 4594984
},
"META-INF/proguard/androidx-annotations.pro": {
"Size": 308
@@ -2990,5 +2990,5 @@
"Size": 103018
}
},
- "PackageSize": 15898508
+ "PackageSize": 16037772
}
\ No newline at end of file
diff --git a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Profiled-Aot.apkdesc b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Profiled-Aot.apkdesc
index a294ec5e1bd..0922fc35ec9 100644
--- a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Profiled-Aot.apkdesc
+++ b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Profiled-Aot.apkdesc
@@ -2,7 +2,7 @@
"Comment": null,
"Entries": {
"AndroidManifest.xml": {
- "Size": 3684
+ "Size": 3664
},
"res/anim/abc_fade_in.xml": {
"Size": 388
@@ -2831,7 +2831,7 @@
"Size": 157
},
"classes.dex": {
- "Size": 1944832
+ "Size": 2200624
},
"assemblies/Xamarin.Forms.Performance.Integration.Droid.dll": {
"Size": 183808
@@ -2981,7 +2981,7 @@
"Size": 164864
},
"assemblies/Mono.Android.dll": {
- "Size": 2242048
+ "Size": 2256896
},
"assemblies/mscorlib.dll": {
"Size": 2090496
@@ -2990,7 +2990,7 @@
"Size": 389632
},
"assemblies/System.dll": {
- "Size": 873984
+ "Size": 874496
},
"assemblies/System.Net.Http.dll": {
"Size": 218112
@@ -3080,7 +3080,7 @@
"Size": 6492
},
"lib/armeabi-v7a/libaot-Mono.Android.dll.so": {
- "Size": 952924
+ "Size": 950768
},
"lib/armeabi-v7a/libaot-Plugin.Connectivity.Abstractions.dll.so": {
"Size": 6492
@@ -3245,7 +3245,7 @@
"Size": 283880
},
"lib/x86/libaot-Mono.Android.dll.so": {
- "Size": 781968
+ "Size": 779856
},
"lib/x86/libaot-Xamarin.Forms.Performance.Integration.Droid.dll.so": {
"Size": 6288
@@ -3542,5 +3542,5 @@
"Size": 122473
}
},
- "PackageSize": 25247267
+ "PackageSize": 25366051
}
\ No newline at end of file
diff --git a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release.apkdesc b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release.apkdesc
index f739407a788..91f20e1b05b 100644
--- a/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release.apkdesc
+++ b/tests/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release.apkdesc
@@ -2,7 +2,7 @@
"Comment": null,
"Entries": {
"AndroidManifest.xml": {
- "Size": 3684
+ "Size": 3664
},
"res/anim/abc_fade_in.xml": {
"Size": 388
@@ -2831,7 +2831,7 @@
"Size": 157
},
"classes.dex": {
- "Size": 1944832
+ "Size": 2200624
},
"assemblies/Xamarin.Forms.Performance.Integration.Droid.dll": {
"Size": 183808
@@ -2981,7 +2981,7 @@
"Size": 164864
},
"assemblies/Mono.Android.dll": {
- "Size": 2242048
+ "Size": 2256896
},
"assemblies/mscorlib.dll": {
"Size": 2090496
@@ -2990,7 +2990,7 @@
"Size": 389632
},
"assemblies/System.dll": {
- "Size": 873984
+ "Size": 874496
},
"assemblies/System.Net.Http.dll": {
"Size": 218112
@@ -3170,5 +3170,5 @@
"Size": 108895
}
},
- "PackageSize": 21007581
+ "PackageSize": 21130461
}
\ No newline at end of file