Skip to content

Commit a45cd82

Browse files
committed
Add more framework assemblies we want to process
1 parent 4bab3ca commit a45cd82

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
@@ -2083,13 +2083,18 @@ because xbuild doesn't support framework reference assemblies.
20832083
DependsOnTargets="_GetReferenceAssemblyPaths;_SetLatestTargetFrameworkVersion"
20842084
Inputs="@(ResolvedUserAssemblies->'$(MonoAndroidLinkerInputDir)%(Filename)%(Extension)')"
20852085
Outputs="$(_AndroidJniMarshalMethodsFlag)">
2086-
2087-
<Exec
2088-
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;', ' ')"
2089-
/>
2086+
<ItemGroup>
2087+
<_JniFrameworkAssembly Include="Mono.Android.dll" />
2088+
<_JniFrameworkAssembly Include="OpenTK-1.0.dll" />
2089+
<_JniFrameworkAssembly Include="OpenTK.dll" />
2090+
<_JniFrameworkAssembly Include="Xamarin.Android.NUnitLite.dll" />
2091+
</ItemGroup>
2092+
<ItemGroup>
2093+
<_AssembliesToProcess Include="@(ResolvedUserAssemblies)" />
2094+
<_AssembliesToProcess Include="@(ResolvedAssemblies)" Condition=" '%(Filename)' != '' And '@(_JniFrameworkAssembly)' != '' " />
2095+
</ItemGroup>
20902096
<Exec
2091-
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;', ' ')"
2092-
Condition=" '%(ResolvedAssemblies.Filename)' == 'Mono.Android' "
2097+
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;', ' ')"
20932098
/>
20942099
<Touch Files="$(_AndroidJniMarshalMethodsFlag)" AlwaysCreate="True" />
20952100
</Target>

0 commit comments

Comments
 (0)