[illink] Do not always preserve CharSequence

Part of dotnet#5167 Added dynamic dependency where needed. Removed API from `BuildReleaseArm64False` test: Type Android.Runtime.CharSequence - Method public static SIGERR ToLocalJniHandle (System.Collections.Generic.IEnumerable`1<char>)
radekdoulik · Dec 3, 2020 · f8eb0fa · f8eb0fa
1 parent fd8aa17
commit f8eb0fa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/Microsoft.Android.Sdk.ILLink/PreserveLists/Mono.Android.xml b/src/Microsoft.Android.Sdk.ILLink/PreserveLists/Mono.Android.xml
@@ -3,7 +3,6 @@
 	<assembly fullname="Mono.Android">
 		<type fullname="Android.Runtime.AndroidEnvironment" />
 		<type fullname="Android.Runtime.AnnotationAttribute" />
-		<type fullname="Android.Runtime.CharSequence" />
 		<type fullname="Android.Runtime.ConstructorBuilder" />
 		<type fullname="Android.Runtime.Extensions" />
 		<type fullname="Android.Runtime.GeneratedDummyHost" />

diff --git a/src/Mono.Android.Export/CallbackCode.cs b/src/Mono.Android.Export/CallbackCode.cs
@@ -26,6 +26,7 @@ class DynamicInvokeTypeInfo
 		// NewArray<T>(T[])
 		static readonly MethodInfo jnienv_newarray                        = GetTArrayToIntPtr<int> (JNIEnv.NewArray<int>);
 		static readonly MethodInfo jnienv_getarray                        = GetIntPtrToTArray<int> (JNIEnv.GetArray<int>);
+		[DynamicDependency ("ToLocalJniHandle", "Android.Runtime.CharSequence", "Mono.Android")]
 		static readonly MethodInfo charsequence_tojnihandle               = GetEnumerableCharToIntPtrMethodInfo (CharSequence.ToLocalJniHandle);
 		static readonly MethodInfo jnienv_tojnihandle                     = GetObjectToIntPtrMethodInfo (JNIEnv.ToLocalJniHandle);
 		static readonly MethodInfo jnienv_newstring                       = GetStringToIntPtrMethodInfo (JNIEnv.NewString);