From cbfb56dc2bc3a7cbb5a039194f4fbd332b17ef6f Mon Sep 17 00:00:00 2001 From: Kevin Jones Date: Wed, 19 Jun 2024 14:41:39 -0400 Subject: [PATCH] [r8] update proguard rule to keep .NET runtime classes (#9044) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Context: https://github.com/dotnet/runtime/pull/103016 Context: https://github.com/dotnet/runtime/pull/103337 In dotnet/runtime we are adding a few more Java classes to assist with .NET crypto. One was added in dotnet/runtime#103016, and another may be added in dotnet/runtime#103337. This PR changes ProGuard to keep all of the classes in this package rather than individually adding them. Co-authored-by: Alexander Köplinger --- .../Resources/proguard_xamarin.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg b/src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg index 4527fd02826..dbebe3a85bc 100644 --- a/src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg +++ b/src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg @@ -25,8 +25,8 @@ -keep class md52ce486a14f4bcd95899665e9d932190b.** { *; (...); } -keepclassmembers class md52ce486a14f4bcd95899665e9d932190b.** { *; (...); } -# .NET 8 runtime --keep class net.dot.android.crypto.DotnetProxyTrustManager { *; (...); } +# .NET runtime +-keep class net.dot.android.crypto.** { *; (...); } # Android's template misses fluent setters... -keepclassmembers class * extends android.view.View {