From ad52b916bb2978bed918b516a98a65d7baca66cd Mon Sep 17 00:00:00 2001
From: Radek Doulik <rodo@xamarin.com>
Date: Thu, 18 May 2017 22:33:33 +0200
Subject: [PATCH] regenerate dex files after generating JCW

 - this is mostly for OpenTK, where we generate JCWs after
   mono.android's JCWs are already generated

 - fortunatelly we don't use jack anymore, only dx. that makes it much
   easier to do
---
 build-tools/scripts/JavaCallableWrappers.targets | 8 ++++++++
 src/Mono.Android/Mono.Android.targets            | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build-tools/scripts/JavaCallableWrappers.targets b/build-tools/scripts/JavaCallableWrappers.targets
index 0aa586705f2..de268f3c5f3 100644
--- a/build-tools/scripts/JavaCallableWrappers.targets
+++ b/build-tools/scripts/JavaCallableWrappers.targets
@@ -40,4 +40,12 @@
         Command="jar cf &quot;$(_MonoAndroidJar)&quot; -C &quot;$(IntermediateOutputPath)jcw\bin&quot; ."
     />
   </Target>
+  <Target Name="_GenerateMonoAndroidDex16"
+      AfterTargets="GenerateJavaCallableWrappers"
+      Inputs="$(OutputPath)mono.android.jar"
+      Outputs="$(OutputPath)mono.android.dex">
+    <Exec
+        Command="&quot;$(AndroidSdkDirectory)\build-tools\$(XABuildToolsFolder)\dx&quot; --dex --no-strict --output=&quot;$(OutputPath)mono.android.dex&quot; &quot;$(OutputPath)mono.android.jar&quot;"
+    />
+  </Target>
 </Project>
diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets
index bbb4ae43877..c5041a92005 100644
--- a/src/Mono.Android/Mono.Android.targets
+++ b/src/Mono.Android/Mono.Android.targets
@@ -105,14 +105,6 @@
   <ItemGroup>
     <_CommonJavaSources Include="java\**\*.java" />
   </ItemGroup>
-  <Target Name="_GenerateMonoAndroidDex16"
-      AfterTargets="GenerateJavaCallableWrappers"
-      Inputs="$(OutputPath)mono.android.jar"
-      Outputs="$(OutputPath)mono.android.dex">
-    <Exec
-        Command="&quot;$(AndroidSdkDirectory)\build-tools\$(XABuildToolsFolder)\dx&quot; --dex --no-strict --output=&quot;$(OutputPath)mono.android.dex&quot; &quot;$(OutputPath)mono.android.jar&quot;"
-    />
-  </Target>
   <Target Name="_GenerateFrameworkList"
       BeforeTargets="GetTargetFrameworkProperties;GetReferenceAssemblyPaths;ResolveReferences"
       Inputs="$(MSBuildProjectFullPath)"