Bump to xamarin/Java.Interop/d16-7@6608c590 (#4569)

Changes: dotnet/java-interop@ec4f819...6608c59 * dotnet/java-interop@6608c59 [generator] Fix generated code that caused CS0169 warnings. (#625) * dotnet/java-interop@0537eb1 Bump to xamarin/xamarin-android-tools/d16-7@310c5cf0 * dotnet/java-interop@59d86de [generator] Add nullable reference types (NRT) support. (#563) * dotnet/java-interop@64c2719 [build] Support building with JetBrains OpenJDK 11 (#629) * dotnet/java-interop@5a21381 [crc64] Change the hash prefix back to `crc64` (#628) * dotnet/java-interop@933876c [crc64] Fix a subtle bug in CRC64 splice-by-8 implementation (#627) * dotnet/java-interop@05c0d7d [performance] Improve speed of our CRC-64 hasher (#624) * dotnet/java-interop@6100554 [Java.Interop.Tools.Cecil] Change DirectoryAssemblyResolver Warning to Diagnostic Output (#622) * dotnet/java-interop@d736086 [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 sizes of `.apk` files, as dotnet/java-interop@9b88ce7 increased the size of `Mono.Android.dll`.
dotnet · Apr 23, 2020 · 1a12037 · 1a12037
1 parent 93a159f
commit 1a12037
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 30 deletions.
diff --git a/external/Java.Interop b/external/Java.Interop
diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj
@@ -92,6 +92,9 @@
     <Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers\Crc64.cs">
       <Link>Crc64.cs</Link>
     </Compile>
+    <Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers\Crc64.Table.cs">
+      <Link>Crc64.Table.cs</Link>
+    </Compile>
     <Compile Include="Android.Runtime\DynamicMethodNameCounter.cs" />
     <Compile Include="Android.Runtime\IJavaObjectValueMarshaler.cs" />
   </ItemGroup>

diff --git 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 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <LibZipSharpBundleAllNativeLibraries>true</LibZipSharpBundleAllNativeLibraries>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <Import Project="..\..\Configuration.props" />
@@ -24,6 +25,9 @@
     <Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers\Crc64.cs">
       <Link>Crc64.cs</Link>
     </Compile>
+    <Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers\Crc64.Table.cs">
+      <Link>Crc64.Table.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>

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
@@ -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
@@ -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
 }
diff --git a/...s/apk-sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Bundle.apkdesc b/...s/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
 }
diff --git a/...sizes-reference/Xamarin.Forms_Performance_Integration-Signed-Release-Profiled-Aot.apkdesc b/...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
 }
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
@@ -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
 }