From 7ea1a81362e458c792698ad5f572e703d68d42cb Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Tue, 29 May 2018 20:28:26 -0400
Subject: [PATCH] Bump to Java.Interop/master/bed29582

Fixes: https://github.com/xamarin/xamarin-android/issues/1493

Allows injection of `<dllmap/>` entries into
`Java.Runtime.Environment.dll.config`.

Use `<fileapi.h>`, not `<FileAPI.h>`, as Linux wants the former.

Add `$(CecilSourceDirectory)` support, and use that support so that
`Xamarin.Android.Cecil.dll` and `Xamarin.Android.Cecil.Mdb.dll` are
built from `external/mono/external/cecil` sources, *not* from
`external/Java.Interop/external/cecil` sources.
---
 Makefile                                                      | 2 ++
 build-tools/scripts/Configuration.Java.Interop.Override.props | 1 +
 external/Java.Interop                                         | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 071616c0c6c..5098e5a180f 100644
--- a/Makefile
+++ b/Makefile
@@ -111,6 +111,8 @@ prepare-deps: prepare-external
 	$(MSBUILD) $(MSBUILD_FLAGS) build-tools/dependencies/dependencies.csproj
 
 prepare-props: prepare-deps
+	cp $(call GetPath,JavaInterop)/external/Mono.Cecil* "$(call GetPath,MonoSource)/external"
+	cp "$(call GetPath,JavaInterop)/product.snk" "$(call GetPath,MonoSource)"
 	cp build-tools/scripts/Configuration.Java.Interop.Override.props external/Java.Interop/Configuration.Override.props
 	cp $(call GetPath,MonoSource)/mcs/class/msfinal.pub .
 
diff --git a/build-tools/scripts/Configuration.Java.Interop.Override.props b/build-tools/scripts/Configuration.Java.Interop.Override.props
index 21f49311f20..69dad68e3c1 100644
--- a/build-tools/scripts/Configuration.Java.Interop.Override.props
+++ b/build-tools/scripts/Configuration.Java.Interop.Override.props
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <CecilSourceDirectory>$(MSBuildThisFileDirectory)..\..\external\mono\external\cecil</CecilSourceDirectory>
     <UtilityOutputFullPath>$(MSBuildThisFileDirectory)..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\</UtilityOutputFullPath>
   </PropertyGroup>
 </Project>
diff --git a/external/Java.Interop b/external/Java.Interop
index 0418d22611a..bed29582923 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 0418d22611a51bc6c630814a6087366103d8df21
+Subproject commit bed29582923e35e692ae9354404937df6c5c1863