Skip to content

Commit 11f0e1b

Browse files
authored
[One .NET] Don't always preserve Android.Runtime.AndroidEnvironment (dotnet#5362)
Context: dotnet#5167 Context: dotnet#5361 The `Android.Runtime.AndroidEnvironment` type is not accessed by reflection *in .NET 6*, and thus does not need to be fully preserved by the linker *in .NET 6*. (Many of these members *are* used via reflection from mono/2020-02.) Allowing `AndroidEnvironment` to be linked allows for multiple members to be removed, e.g. for the `BuildReleaseArm64False` test: Type Android.Runtime.AndroidEnvironment - Field public static string AndroidLogAppName - Field static Javax.Net.Ssl.IX509TrustManager sslTrustManager - Field static Java.Security.KeyStore certStore - Method static SIGERR SetupTrustManager () - Method static SIGERR SetupCertStore () - Method public static SIGERR add_UnhandledExceptionRaiser (System.EventHandler`1<Android.Runtime.RaiseThrowableEventArgs>) - Method public static SIGERR remove_UnhandledExceptionRaiser (System.EventHandler`1<Android.Runtime.RaiseThrowableEventArgs>) - Method static SIGERR TrustEvaluateSsl (System.Collections.Generic.List`1<byte[]>) - Method static SIGERR CertStoreLookup (long, bool) - Method static SIGERR GetX509CertificateFactory () - Method static SIGERR ConvertCertificate (Java.Security.Cert.CertificateFactory, byte[]) - Method static SIGERR NotifyTimeZoneChanged () - Method static SIGERR GetDisplayDPI (float&, float&) - Method static SIGERR GetDefaultTimeZone () - Method static SIGERR _monodroid_timezone_get_default_id () - Method static SIGERR GetDefaultSyncContext () - Method static SIGERR _monodroid_getifaddrs (IntPtr&) - Method static SIGERR GetInterfaceAddresses (IntPtr&) - Method static SIGERR _monodroid_freeifaddrs (IntPtr) - Method static SIGERR FreeInterfaceAddresses (IntPtr) - Method static SIGERR _monodroid_detect_cpu_and_architecture (ushort&, ushort&, byte&) - Method static SIGERR DetectCPUAndArchitecture (ushort&, ushort&, bool&) - Method static SIGERR GetDefaultProxy () - Method static SIGERR GetHttpMessageHandler () - Type _Proxy The removed API is no longer needed on .NET 5+. The template tests run OK on device after the removal.
1 parent 9ad0947 commit 11f0e1b

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

src/Microsoft.Android.Sdk.ILLink/PreserveLists/Mono.Android.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<linker>
33
<assembly fullname="Mono.Android">
4-
<type fullname="Android.Runtime.AndroidEnvironment" />
54
<type fullname="Android.Runtime.AnnotationAttribute" />
65
<type fullname="Android.Runtime.GeneratedDummyHost" />
76
<type fullname="Android.Runtime.GeneratedEnumAttribute" />

0 commit comments

Comments
 (0)