Merge branch 'main' into dev/grendel/blobs-in-lib

grendello · grendello · commit 9421587c9493 · 2024-02-22T09:55:36.000+01:00
* main: [xamarin-android-tools] import $(LibZipSharpVersion) value (#8738) Bump to xamarin/Java.Interop/main@c825dcad (#8701) Bump to xamarin/monodroid@cb01503327 (#8742) Bump to xamarin/Java.Interop/main@ae65609 (#8744)
diff --git a/.external b/.external
@@ -1 +1 @@
-xamarin/monodroid:dev/grendel/blobs-in-lib@35c8ea84ae7cc5008c14171635b0975740b7055e
+xamarin/monodroid:dev/grendel/blobs-in-lib@cb01503327f7723ec138ec4cc051610fecee1bf7
diff --git a/external/Java.Interop b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 7d1e7057cf4b0adcf65e7064186326dafce11b72
+Subproject commit c825dcad8e7fe2e1ba5846a592a02f6a578db991
diff --git a/external/xamarin-android-tools.override.props b/external/xamarin-android-tools.override.props
@@ -0,0 +1,4 @@
+<Project>
+  <!-- Import $(LibZipSharpVersion) -->
+  <Import Project="..\Directory.Build.props" />
+</Project>
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs
@@ -15,6 +15,7 @@
 
 using Xamarin.Android.Tools;
 using Microsoft.Android.Build.Tasks;
+using Java.Interop.Tools.JavaCallableWrappers.Adapters;
 
 namespace Xamarin.Android.Tasks
 {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-xamarin/monodroid:dev/grendel/blobs-in-lib@35c8ea84ae7cc5008c14171635b0975740b7055e`
	`1`	`+xamarin/monodroid:dev/grendel/blobs-in-lib@cb01503327f7723ec138ec4cc051610fecee1bf7`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`using Xamarin.Android.Tools;`
`17`	`17`	`using Microsoft.Android.Build.Tasks;`
	`18`	`+using Java.Interop.Tools.JavaCallableWrappers.Adapters;`
`18`	`19`
`19`	`20`	`namespace Xamarin.Android.Tasks`
`20`	`21`	`{`