From 1f2a0219a34e5b5ff6e9e8d76d6fab8ea231e809 Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Wed, 9 Sep 2020 10:29:52 -0500
Subject: [PATCH] Bump to xamarin/Java.Interop/master@ac914ce3 (#5097)

Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1193891

Changes: https://github.com/xamarin/java.interop/compare/afbc5b3223d2445784f1de721347dbe248db9e71...ac914ce362c478e937f2c77f57b6bab2fbfd7bd6

  * xamarin/Java.Interop@ac914ce3: [ci] Add DevDiv required Roslyn analyzers, fix errors (#704)
  * xamarin/Java.Interop@a98c1ae1: [build] fix env vars causing gradle build error (#705)
  * xamarin/Java.Interop@75354b9f: [Java.Interop] Dispose, *then* Remove (#708)
  * xamarin/Java.Interop@8ea0bb28: [jnimarshalmethod-gen] Localizable errors (#696)

Commit xamarin/Java.Interop@ac914ce3 moved the location of
`NullableAttributes.cs`; update
`Xamarin.Android.Tools.JavadocImporter.csproj` appropriately.
---
 external/Java.Interop                                           | 2 +-
 .../Xamarin.Android.Tools.JavadocImporter.csproj                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/external/Java.Interop b/external/Java.Interop
index afbc5b3223d..ac914ce362c 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit afbc5b3223d2445784f1de721347dbe248db9e71
+Subproject commit ac914ce362c478e937f2c77f57b6bab2fbfd7bd6
diff --git a/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj b/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj
index 4af28f01ba8..d68922b4dcf 100644
--- a/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj
+++ b/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj
@@ -29,7 +29,7 @@
     <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="..\..\external\Java.Interop\src\Java.Interop\NullableAttributes.cs">
+    <Compile Include="..\..\external\Java.Interop\src\utils\NullableAttributes.cs">
       <Link>NullableAttributes.cs</Link>
     </Compile>
   </ItemGroup>