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

* 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)
dotnet · Feb 22, 2024 · 9421587 · 9421587
2 parents d40ed29 + d21f6db
commit 9421587
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
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
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 @@
		xamarin/monodroid:dev/grendel/blobs-in-lib@35c8ea84ae7cc5008c14171635b0975740b7055e
		xamarin/monodroid:dev/grendel/blobs-in-lib@cb01503327f7723ec138ec4cc051610fecee1bf7