File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed
src/Xamarin.Android.Build.Tasks Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -2085,6 +2085,11 @@ because xbuild doesn't support framework reference assemblies.
20852085 Inputs =" @(ResolvedUserAssemblies);$(_AndroidBuildPropertiesCache)"
20862086 Outputs =" $(_AndroidLinkFlag)" >
20872087
2088+ <ItemGroup >
2089+ <_AssembliesToLink Condition =" '$(AndroidGenerateJniMarshalMethods)' != 'True' " Include =" @(ResolvedAssemblies)" />
2090+ <_AssembliesToLink Condition =" '$(AndroidGenerateJniMarshalMethods)' == 'True' " Include =" @(_JniMarshalMethodAssemblies)" />
2091+ </ItemGroup >
2092+
20882093 <CreateProperty
20892094 Condition=" '$(AndroidLinkTool)' != '' "
20902095 Value=" $(IntermediateOutputPath)proguard\proguard_project_references.cfg" >
@@ -2105,7 +2110,7 @@ because xbuild doesn't support framework reference assemblies.
21052110 PreserveJniMarshalMethods =" $(AndroidGenerateJniMarshalMethods)"
21062111 EnableProguard =" $(AndroidEnableProguard)"
21072112 DumpDependencies =" $(LinkerDumpDependencies)"
2108- ResolvedAssemblies =" @(ResolvedAssemblies )"
2113+ ResolvedAssemblies =" @(_AssembliesToLink )"
21092114 HttpClientHandlerType =" $(AndroidHttpClientHandlerType)"
21102115 TlsProvider =" $(AndroidTlsProvider)" />
21112116
You can’t perform that action at this time.
0 commit comments