Skip to content

Commit ad619d9

Browse files
committed
Add more framework assemblies we want to process
1 parent eefa61d commit ad619d9

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2067,13 +2067,18 @@ because xbuild doesn't support framework reference assemblies.
20672067
DependsOnTargets="_GetReferenceAssemblyPaths;_SetLatestTargetFrameworkVersion"
20682068
Inputs="@(ResolvedUserAssemblies->'$(MonoAndroidLinkerInputDir)%(Filename)%(Extension)')"
20692069
Outputs="$(_AndroidJniMarshalMethodsFlag)">
2070-
2071-
<Exec
2072-
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;', ' ')"
2073-
/>
2070+
<ItemGroup>
2071+
<_JniFrameworkAssembly Include="Mono.Android.dll" />
2072+
<_JniFrameworkAssembly Include="OpenTK-1.0.dll" />
2073+
<_JniFrameworkAssembly Include="OpenTK.dll" />
2074+
<_JniFrameworkAssembly Include="Xamarin.Android.NUnitLite.dll" />
2075+
</ItemGroup>
2076+
<ItemGroup>
2077+
<_AssembliesToProcess Include="@(ResolvedUserAssemblies)" />
2078+
<_AssembliesToProcess Include="@(ResolvedAssemblies)" Condition=" '%(Filename)' != '' And '@(_JniFrameworkAssembly)' != '' " />
2079+
</ItemGroup>
20742080
<Exec
2075-
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;', ' ')"
2076-
Condition=" '%(ResolvedAssemblies.Filename)' == 'Mono.Android' "
2081+
Command="MONO_PATH=&quot;$(_XATargetFrameworkDirectories)&quot; &quot;$(MonoAndroidBinDirectory)\mono&quot; &quot;$(MonoAndroidToolsDirectory)\jnimarshalmethod-gen.exe&quot; --jvm=&quot;$(JdkJvmPath)&quot; @(_AssembliesToProcess->'&quot;$(MonoAndroidLinkerInputDir)%(Filename)%(Extension)&quot;', ' ')"
20772082
/>
20782083
<Touch Files="$(_AndroidJniMarshalMethodsFlag)" AlwaysCreate="True" />
20792084
</Target>

0 commit comments

Comments
 (0)