From 30b9c13b888df843c497a24949a65888e14f788b Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Fri, 22 Nov 2024 20:54:56 +0100
Subject: [PATCH] Change wording a bit, include page size in the message

---
 .../Properties/Resources.Designer.cs                           | 2 +-
 src/Xamarin.Android.Build.Tasks/Properties/Resources.resx      | 3 ++-
 src/Xamarin.Android.Build.Tasks/Utilities/ELFHelper.cs         | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs b/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs
index 2ac2c675867..ca1679a26f6 100644
--- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs
+++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs
@@ -522,7 +522,7 @@ public static string XA0140 {
         }
 
         /// <summary>
-        ///   Looks up a localized string similar to NuGet package &apos;{0}&apos; version &apos;{1}&apos; contains a shared library &apos;{2}&apos; ({3}) which is not correctly aligned. See https://developer.android.com/guide/practices/page-sizes for more details.
+        ///   Looks up a localized string similar to NuGet package '{0}' version '{1}' contains a shared library '{2}' ({3}) which is not aligned to the {4} byte boundary. Google will require such alignment in the future. See https://developer.android.com/guide/practices/page-sizes for more details
         /// </summary>
         public static string XA0141 {
             get {
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
index 8ca40719558..40e455b3234 100644
--- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
+++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
@@ -1072,12 +1072,13 @@ To use a custom JDK path for a command line build, set the 'JavaSdkDirectory' MS
 {1} - NuGet package version</comment>
   </data>
   <data name="XA0141" xml:space="preserve">
-    <value>NuGet package '{0}' version '{1}' contains a shared library '{2}' ({3}) which is not correctly aligned. See https://developer.android.com/guide/practices/page-sizes for more details</value>
+    <value>NuGet package '{0}' version '{1}' contains a shared library '{2}' ({3}) which is not aligned to the {4} byte boundary. Google will require such alignment in the future. See https://developer.android.com/guide/practices/page-sizes for more details</value>
     <comment>The following is a literal name and should not be translated: NuGet
 {0} - NuGet package id
 {1} - NuGet package version
 {2} - shared library file name
 {3} - target architecture name
+{4} - is an integer (size in bytes)
     </comment>
   </data>
   <data name="XA4249" xml:space="preserve">
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ELFHelper.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ELFHelper.cs
index 3f94dc73595..bc48aa436bd 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/ELFHelper.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/ELFHelper.cs
@@ -80,7 +80,8 @@ static void AssertValidLibraryAlignment (TaskLoggingHelper log, uint pageSize, s
 					packageId,
 					packageVersion,
 					Path.GetFileName (path),
-					archName
+					archName,
+					pageSize
 				);
 				break;
 			}