From b5066be2de993f3153c7c2541db9d2c65ed79f66 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Tue, 24 Aug 2021 14:39:30 -0400
Subject: [PATCH] Bump to xamarin/Java.Interop/main@b7982e42

Changes: http://github.com/xamarin/Java.Interop/compare/ff2714200107fb616828b9d1013f69605791d2ba...b7982e423952a4c4afe0c33f36ac80eed7fa57a2

  * xamarin/Java.Interop@b7982e42: Revert "[build] Use GitInfo to generate $(Version) (#865)" (#874)
  * xamarin/Java.Interop@9a878f21: [build] Properly implement "parent directory.override.props" (#300) (#873)
  * xamarin/Java.Interop@0c5d454c: [Java.Interop] fix .NET 6 linker warnings (#870)
  * xamarin/Java.Interop@8898bc14: [build] Import $(MSBuildProjectDirectory).override.props (#872)
  * xamarin/Java.Interop@d16b1e56: [build] Use GitInfo to generate $(Version) (#865)
  * xamarin/Java.Interop@2eb9ff26: [build] .NET 6 P7 Support (#869)

Set `$(XamarinAndroidToolsDirectory)` for `external/Java.Interop`
so that the Java.Interop build uses `external/xamarin-android-tools`.
---
 external/Java.Interop                | 2 +-
 external/Java.Interop.override.props | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 external/Java.Interop.override.props

diff --git a/external/Java.Interop b/external/Java.Interop
index ff271420010..b7982e42395 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit ff2714200107fb616828b9d1013f69605791d2ba
+Subproject commit b7982e423952a4c4afe0c33f36ac80eed7fa57a2
diff --git a/external/Java.Interop.override.props b/external/Java.Interop.override.props
new file mode 100644
index 00000000000..8cbac6945cf
--- /dev/null
+++ b/external/Java.Interop.override.props
@@ -0,0 +1,7 @@
+<Project>
+
+  <PropertyGroup>
+    <XamarinAndroidToolsDirectory>$(MSBuildThisFileDirectory)xamarin-android-tools</XamarinAndroidToolsDirectory>
+  </PropertyGroup>
+
+</Project>