Skip to content

Commit

Permalink
A fixlet
Browse files Browse the repository at this point in the history
  • Loading branch information
grendello committed Jul 20, 2023
1 parent 3264c37 commit 52d5e5d
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,12 @@ void RunReleaseNoLinking (bool useMarshalMethods)
LogRunMode ("Release, no linking");

Dictionary<AndroidTargetArch, XAAssemblyResolver> resolvers = MakeResolvers (useMarshalMethods);

// All the RID-agnostic asseemblies will use resolvers of this architecture. This is because the RidAwareInputAssemblySet does not store
// such assemblies separately, but it copies them to **all** the target RIDs. This, in turn, is done because of typemaps and marshal methods
// which process data in a way that requires proper sorting of assemblies per MVID and it requires valid type and method token IDs.
AndroidTargetArch firstArch = resolvers.First ().Key;
resolvers.Add (AndroidTargetArch.None, resolvers[firstArch]);
var assemblies = CollectInterestingAssemblies (new RidAwareInputAssemblySet (resolvers.Keys), (AndroidTargetArch arch) => resolvers[arch]);
RunReleaseCommon (useMarshalMethods, assemblies, resolvers);
}
Expand Down

0 comments on commit 52d5e5d

Please sign in to comment.