Skip to content

[Xamarin.Android.Build.Tasks] Keep ICustomMarshaler.GetInstance (#404) #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 1 commit into from
Mar 16, 2017
Merged

[Xamarin.Android.Build.Tasks] Keep ICustomMarshaler.GetInstance (#404) #499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/MonoDroidMarkStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ namespace MonoDroid.Tuner
class MonoDroidMarkStep : MarkStep
{
const string RegisterAttribute = "Android.Runtime.RegisterAttribute";
const string ICustomMarshalerName = "System.Runtime.InteropServices.ICustomMarshaler";

// If this is one of our infrastructure methods that has [Register], like:
// [Register ("hasWindowFocus", "()Z", "GetHasWindowFocusHandler")],
Expand Down Expand Up @@ -142,6 +143,15 @@ protected override TypeDefinition MarkType (TypeReference reference)
if (type.Module.Assembly.Name.Name == "System.Core")
ProcessSystemCore (type);

if (type.HasMethods && type.HasInterfaces && type.Implements (ICustomMarshalerName)) {
foreach (MethodDefinition method in type.Methods) {
if (method.Name == "GetInstance" && method.IsStatic && method.HasParameters && method.Parameters.Count == 1 && method.ReturnType.FullName == ICustomMarshalerName && method.Parameters.First ().ParameterType.FullName == "System.String") {
MarkMethod (method);
break;
}
}
}

return type;
}

Expand Down