From b2050f2584368dad31a09e78af2ea31daea14561 Mon Sep 17 00:00:00 2001
From: Radek Doulik <radekdoulik@gmail.com>
Date: Wed, 9 Dec 2020 17:40:14 +0100
Subject: [PATCH 1/2] [illink] Do not preserve whole JNIEnv class

Part of https://github.com/xamarin/xamarin-android/issues/5167

Instead preserve just methods accessed from native code.
---
 .../PreserveLists/Mono.Android.xml                         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.Android.Sdk.ILLink/PreserveLists/Mono.Android.xml b/src/Microsoft.Android.Sdk.ILLink/PreserveLists/Mono.Android.xml
index a52ca1b57b2..01988c3503e 100644
--- a/src/Microsoft.Android.Sdk.ILLink/PreserveLists/Mono.Android.xml
+++ b/src/Microsoft.Android.Sdk.ILLink/PreserveLists/Mono.Android.xml
@@ -7,7 +7,12 @@
 		<type fullname="Android.Runtime.IJavaObject" />
 		<type fullname="Android.Runtime.InputStreamAdapter" />
 		<type fullname="Android.Runtime.InputStreamInvoker" />
-		<type fullname="Android.Runtime.JNIEnv" />
+		<type fullname="Android.Runtime.JNIEnv">
+			<method name="Exit" />
+			<method name="Initialize" />
+			<method name="PropagateUncaughtException" />
+			<method name="RegisterJniNatives" />
+		</type>
 		<type fullname="Android.Runtime.JniNativeInterfaceStruct" />
 		<type fullname="Android.Runtime.JniNativeInterfaceInvoker" />
 		<type fullname="Android.Runtime.JNINativeWrapper" />

From 6a7afd9d8b284f1c9e714bbae00db0128e0aae5c Mon Sep 17 00:00:00 2001
From: Radek Doulik <radekdoulik@gmail.com>
Date: Wed, 9 Dec 2020 21:59:52 +0100
Subject: [PATCH 2/2] Update CheckIncludedAssemblies test

---
 .../Tests/Xamarin.Android.Build.Tests/PackagingTest.cs           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
index fffd4ce4c7a..7550df6bee6 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
@@ -86,7 +86,6 @@ public void CheckIncludedAssemblies ()
 				new [] {
 					"Java.Interop.dll",
 					"Mono.Android.dll",
-					"System.ComponentModel.Primitives.dll",
 					"System.Console.dll",
 					"System.Linq.Expressions.dll",
 					"System.Net.Primitives.dll",