Revert "Use --types option when generating marshal methods for Mono.Android"

This reverts commit 66d34a1.

Author: radekdoulik

src/Mono.Android/Mono.Android.jnimarshalmethods.types

@@ -167,17 +167,4 @@
       AfterTargets="Clean">
     <RemoveDir Directories="$(IntermediateOutputPath)" />
   </Target>
-  <PropertyGroup>
-    <_JniMarshalMethodsTypesFile>Mono.Android.jnimarshalmethods.types</_JniMarshalMethodsTypesFile>
-    <_JniMarshalMethodsTypesInstallDirectory>$(XAInstallPrefix)xbuild\Xamarin\Android</_JniMarshalMethodsTypesInstallDirectory>
-  </PropertyGroup>
-  <Target Name="_CopyJniMarshalMethodsTypesFile"
-      BeforeTargets="CoreCompile"
-      Inputs="$(_JniMarshalMethodsTypesFile)"
-      Outputs="$(_JniMarshalMethodsTypesInstallDirectory)\$(_JniMarshalMethodsTypesFile)">
-    <Copy
-        SourceFiles="$(_JniMarshalMethodsTypesFile)"
-        DestinationFolder="$(_JniMarshalMethodsTypesInstallDirectory)"
-    />
-  </Target>
 </Project>

src/Mono.Android/Mono.Android.targets

@@ -308,8 +308,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 	<_AndroidBuildPropertiesCache>$(IntermediateOutputPath)build.props</_AndroidBuildPropertiesCache>
 	<_AndroidDesignTimeBuildPropertiesCache>$(_AndroidIntermediateDesignTimeBuildDirectory)build.props</_AndroidDesignTimeBuildPropertiesCache>
 	<AndroidGenerateJniMarshalMethods Condition=" '$(AndroidGenerateJniMarshalMethods)' == '' ">False</AndroidGenerateJniMarshalMethods>
-	<AndroidMonoAndroidJniMarshalTypesEnabled Condition=" '$(AndroidMonoAndroidJniMarshalTypesEnabled)' == '' ">True</AndroidMonoAndroidJniMarshalTypesEnabled>
-	<AndroidMonoAndroidJniMarshalTypes Condition=" '$(AndroidMonoAndroidJniMarshalTypes)' == '' ">$(MonoAndroidToolsDirectory)\Mono.Android.jnimarshalmethods.types</AndroidMonoAndroidJniMarshalTypes>
 	<AndroidMakeBundleKeepTemporaryFiles Condition=" '$(AndroidMakeBundleKeepTemporaryFiles)' == '' ">False</AndroidMakeBundleKeepTemporaryFiles>
 </PropertyGroup>
 
@@ -2073,11 +2071,8 @@ because xbuild doesn't support framework reference assemblies.
   <Exec
        Command="MONO_PATH=&quot;$(_XATargetFrameworkDirectories)&quot; &quot;$(MonoAndroidBinDirectory)\mono&quot; &quot;$(MonoAndroidToolsDirectory)\jnimarshalmethod-gen.exe&quot; --jvm=&quot;$(JdkJvmPath)&quot; @(ResolvedUserAssemblies->'&quot;$(MonoAndroidLinkerInputDir)%(Filename)%(Extension)&quot;', ' ')"
   />
-  <PropertyGroup>
-    <_MonoAndroidJniMarshalMethodsTypesOption Condition=" '$(AndroidMonoAndroidJniMarshalTypesEnabled)' == 'True' ">--types=&quot;$(AndroidMonoAndroidJniMarshalTypes)&quot;</_MonoAndroidJniMarshalMethodsTypesOption>
-  </PropertyGroup>
   <Exec
-       Command="MONO_PATH=&quot;$(_XATargetFrameworkDirectories)&quot; &quot;$(MonoAndroidBinDirectory)\mono&quot; &quot;$(MonoAndroidToolsDirectory)\jnimarshalmethod-gen.exe&quot; --jvm=&quot;$(JdkJvmPath)&quot; $(_MonoAndroidJniMarshalMethodsTypesOption) @(ResolvedAssemblies->'&quot;$(MonoAndroidLinkerInputDir)%(Filename)%(Extension)&quot;', ' ')"
+       Command="MONO_PATH=&quot;$(_XATargetFrameworkDirectories)&quot; &quot;$(MonoAndroidBinDirectory)\mono&quot; &quot;$(MonoAndroidToolsDirectory)\jnimarshalmethod-gen.exe&quot; --jvm=&quot;$(JdkJvmPath)&quot; @(ResolvedAssemblies->'&quot;$(MonoAndroidLinkerInputDir)%(Filename)%(Extension)&quot;', ' ')"
        Condition=" '%(ResolvedAssemblies.Filename)' == 'Mono.Android' "
   />
   <Touch Files="$(_AndroidJniMarshalMethodsFlag)" AlwaysCreate="True" />