Skip to content

Bump to xamarin/Java.Interop/master@c19794e6 #4569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/Java.Interop
3 changes: 3 additions & 0 deletions src/Mono.Android/Mono.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<LibZipSharpBundleAllNativeLibraries>true</LibZipSharpBundleAllNativeLibraries>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<Import Project="..\..\Configuration.props" />
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Comment": null,
"Entries": {
"AndroidManifest.xml": {
"Size": 3684
"Size": 3664
},
"res/anim/abc_fade_in.xml": {
"Size": 388
Expand Down Expand Up @@ -2831,7 +2831,7 @@
"Size": 157
},
"classes.dex": {
"Size": 1944832
"Size": 2200624
},
"assemblies/Xamarin.Forms.Performance.Integration.Droid.dll": {
"Size": 183808
Expand Down Expand Up @@ -2981,7 +2981,7 @@
"Size": 164864
},
"assemblies/Mono.Android.dll": {
"Size": 2242048
"Size": 2256896
},
"assemblies/mscorlib.dll": {
"Size": 2090496
Expand All @@ -2990,7 +2990,7 @@
"Size": 389632
},
"assemblies/System.dll": {
"Size": 873984
"Size": 874496
},
"assemblies/System.Net.Http.dll": {
"Size": 218112
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -3542,5 +3542,5 @@
"Size": 122473
}
},
"PackageSize": 47332899
"PackageSize": 47455779
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Comment": null,
"Entries": {
"AndroidManifest.xml": {
"Size": 3684
"Size": 3664
},
"res/anim/abc_fade_in.xml": {
"Size": 388
Expand Down Expand Up @@ -2831,7 +2831,7 @@
"Size": 157
},
"classes.dex": {
"Size": 1944832
"Size": 2200624
},
"lib/armeabi-v7a/libmonodroid.so": {
"Size": 170812
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -2990,5 +2990,5 @@
"Size": 103018
}
},
"PackageSize": 15898508
"PackageSize": 16037772
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Comment": null,
"Entries": {
"AndroidManifest.xml": {
"Size": 3684
"Size": 3664
},
"res/anim/abc_fade_in.xml": {
"Size": 388
Expand Down Expand Up @@ -2831,7 +2831,7 @@
"Size": 157
},
"classes.dex": {
"Size": 1944832
"Size": 2200624
},
"assemblies/Xamarin.Forms.Performance.Integration.Droid.dll": {
"Size": 183808
Expand Down Expand Up @@ -2981,7 +2981,7 @@
"Size": 164864
},
"assemblies/Mono.Android.dll": {
"Size": 2242048
"Size": 2256896
},
"assemblies/mscorlib.dll": {
"Size": 2090496
Expand All @@ -2990,7 +2990,7 @@
"Size": 389632
},
"assemblies/System.dll": {
"Size": 873984
"Size": 874496
},
"assemblies/System.Net.Http.dll": {
"Size": 218112
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -3542,5 +3542,5 @@
"Size": 122473
}
},
"PackageSize": 25247267
"PackageSize": 25366051
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Comment": null,
"Entries": {
"AndroidManifest.xml": {
"Size": 3684
"Size": 3664
},
"res/anim/abc_fade_in.xml": {
"Size": 388
Expand Down Expand Up @@ -2831,7 +2831,7 @@
"Size": 157
},
"classes.dex": {
"Size": 1944832
"Size": 2200624
},
"assemblies/Xamarin.Forms.Performance.Integration.Droid.dll": {
"Size": 183808
Expand Down Expand Up @@ -2981,7 +2981,7 @@
"Size": 164864
},
"assemblies/Mono.Android.dll": {
"Size": 2242048
"Size": 2256896
},
"assemblies/mscorlib.dll": {
"Size": 2090496
Expand All @@ -2990,7 +2990,7 @@
"Size": 389632
},
"assemblies/System.dll": {
"Size": 873984
"Size": 874496
},
"assemblies/System.Net.Http.dll": {
"Size": 218112
Expand Down Expand Up @@ -3170,5 +3170,5 @@
"Size": 108895
}
},
"PackageSize": 21007581
"PackageSize": 21130461
}