Skip to content

[linker] Make sure we mark *Invoker types #3364

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
radekdoulik merged 3 commits into from
Jul 19, 2019
Merged

[linker] Make sure we mark *Invoker types #3364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
643b333
[linker] Make sure we mark *Invoker types
radekdoulik Jul 17, 2019
68c85c6
Added test for https://github.com/xamarin/xamarin-android/issues/3263
radekdoulik Jul 18, 2019
c665b91
Add EditText to multidex version of the Mono.Android test as well
radekdoulik Jul 18, 2019
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
6 changes: 6 additions & 0 deletions src/Mono.Android/Test/Resources/layout/Main.axml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
android:layout_height="wrap_content"
android:editable="false"
/>
<EditText
android:id="@+id/edit_text"
android:layout_weight="1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
/>
<ScrollView
android:id="@+id/my_scroll_view"
android:layout_width="fill_parent"
Expand Down
3 changes: 3 additions & 0 deletions src/Mono.Android/Test/Xamarin.Android.RuntimeTests/MainActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ protected override void OnCreate (Bundle bundle)
// ignore
};

// test https://github.com/xamarin/xamarin-android/issues/3263
edit_text.TextChanged += delegate { };

csharp_simple_fragment.AllowEnterTransitionOverlap = true;
csharp_partial_assembly.AllowEnterTransitionOverlap = true;
csharp_full_assembly.AllowEnterTransitionOverlap = true;
Expand Down
2 changes: 2 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/MarkJavaObjects.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ void PreserveInvoker (TypeDefinition type)
if (invoker == null)
return;

Annotations.Mark (invoker);

PreserveIntPtrConstructor (invoker);
PreserveInterfaceMethods (type, invoker);
}
Expand Down
6 changes: 6 additions & 0 deletions tests/Runtime-MultiDex/Resources/layout/Main.axml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
android:layout_height="wrap_content"
android:editable="false"
/>
<EditText
android:id="@+id/edit_text"
android:layout_weight="1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
/>
<ScrollView
android:id="@+id/my_scroll_view"
android:layout_width="fill_parent"
Expand Down