Update our copy of Java.Runtime.Environment.dll.config

Add dll maps to map `libmono-android` as `java-interop` shared library
for `Java.Runtime.Environment.dll`. Similar way as we do for
`Java.Interop.dll` in `monodroid.targets`

Author: radekdoulik

build-tools/scripts/java-interop.dllmap

@@ -0,0 +1,4 @@
+  <dllmap dll="java-interop" os="osx" target="lib/host-Darwin/libmono-android.debug.dylib" />
+  <dllmap dll="java-interop" os="linux" target="lib/host-Linux/libmono-android.debug.so" />
+  <dllmap dll="java-interop" os="windows" wordsize="64" target="lib/host-mxe-Win64/libmono-android.debug.dll" />
+  <dllmap dll="java-interop" os="windows" wordsize="32" target="lib/host-mxe-Win32/libmono-android.debug.dll" />

src/monodroid/monodroid.csproj

@@ -32,6 +32,11 @@
       <Name>dependencies</Name>
       <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="..\..\external\Java.Interop\tools\jnimarshalmethod-gen\Xamarin.Android.Tools.JniMarshalMethodGenerator.csproj">
+      <Project>{D1295A8F-4F42-461D-A046-564476C10002}</Project>
+      <Name>jnimarshalmethod-gen</Name>
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\mono-runtimes\mono-runtimes.csproj">
       <Project>{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2}</Project>
       <Name>mono-runtimes</Name>

src/monodroid/monodroid.targets

@@ -5,6 +5,7 @@
   <Import Project="monodroid.projitems" />
   <Import Project="..\..\build-tools\scripts\RequiredPrograms.targets" />
   <UsingTask AssemblyFile="..\..\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.GenerateMonoDroidIncludes" />
+  <UsingTask AssemblyFile="..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" />
   <PropertyGroup>
     <_Conf>$(Configuration.ToLowerInvariant())</_Conf>
   </PropertyGroup>
@@ -116,7 +117,7 @@
     </ItemGroup>
   </Target>
   <Target Name="_BuildHostRuntimes"
-      DependsOnTargets="_GetBuildHostRuntimes;_CreateJavaInteropDllConfig"
+      DependsOnTargets="_GetBuildHostRuntimes;_CreateJavaInteropDllConfigs"
       Inputs="@(_CFile);@(_UnixCFile)"
       Outputs="@(_HostRuntime->'$(OutputPath)%(OutputDirectory)\libmono-android.debug.%(NativeLibraryExtension)')">
     <Message Text="Building host runtime %(_HostRuntime.Identity) in $(OutputPath)%(_HostRuntime.OutputDirectory)"/>
@@ -143,20 +144,29 @@
         Command="%(_HostRuntime.Strip) %(_HostRuntime.StripFlags) &quot;$(OutputPath)%(_HostRuntime.OutputDirectory)\libmono-android.release.%(_HostRuntime.NativeLibraryExtension)&quot;"
     />
   </Target>
-  <Target Name="_CreateJavaInteropDllConfig"
-      Inputs="$(XAInstallPrefix)xbuild\Xamarin\Android\Java.Interop.dll"
-      Outputs="$(XAInstallPrefix)xbuild\Xamarin\Android\Java.Interop.dll.config">
+  <Target Name="_CreateJavaInteropDllConfigs"
+      Inputs="$(XAInstallPrefix)xbuild\Xamarin\Android\Java.Interop.dll;$(JavaInteropSourceDirectory)\src\Java.Runtime.Environment\Java.Runtime.Environment.dll.config"
+      Outputs="$(XAInstallPrefix)xbuild\Xamarin\Android\Java.Interop.dll.config;$(XAInstallPrefix)xbuild\Xamarin\Android\Java.Runtime.Environment.dll.config">
+    <ReadLinesFromFile
+        File="../../build-tools/scripts/java-interop.dllmap">
+        <Output
+            TaskParameter="Lines"
+            ItemName="_JavaInteropDllMapContent" />
+    </ReadLinesFromFile>
     <WriteLinesToFile
         File="$(XAInstallPrefix)xbuild\Xamarin\Android\Java.Interop.dll.config"
-        Lines="&lt;configuration&gt;
-  &lt;dllmap dll=&quot;java-interop&quot; os=&quot;osx&quot; target=&quot;lib/host-Darwin/libmono-android.debug.dylib&quot; /&gt;
-  &lt;dllmap dll=&quot;java-interop&quot; os=&quot;linux&quot; target=&quot;lib/host-Linux/libmono-android.debug.so&quot; /&gt;
-  &lt;dllmap dll=&quot;java-interop&quot; os=&quot;windows&quot; wordsize=&quot;64&quot; target=&quot;lib/host-mxe-Win64/libmono-android.debug.dll&quot; /&gt;
-  &lt;dllmap dll=&quot;java-interop&quot; os=&quot;windows&quot; wordsize=&quot;32&quot; target=&quot;lib/host-mxe-Win32/libmono-android.debug.dll&quot; /&gt;
-&lt;/configuration&gt;"
+        Lines="&lt;configuration&gt;;@(_JavaInteropDllMapContent);&lt;/configuration&gt;"
         Overwrite="True"
-	/>
-    </Target>
+    />
+    <PropertyGroup>
+        <DllMaps>@(_JavaInteropDllMapContent->'%(Identity)', '%0a  ')</DllMaps>
+    </PropertyGroup>
+    <ReplaceFileContents
+        SourceFile="$(JavaInteropSourceDirectory)\src\Java.Runtime.Environment\Java.Runtime.Environment.dll.config"
+        DestinationFile="$(XAInstallPrefix)xbuild\Xamarin\Android\Java.Runtime.Environment.dll.config"
+        Replacements="&lt;configuration&gt;=&lt;configuration&gt;%0a  $(DllMaps)"
+    />
+  </Target>
   <Target Name="CoreCompile"
       DependsOnTargets="Build">
   </Target>