Bump to Android NDK r25 (#6764)

Changes: https://github.com/android/ndk/wiki/Changelog-r25#changes Bump to the current NDK LTS r25. There are no changes that are interesting from the Xamarin.Android point of view.
dotnet · Jul 26, 2022 · 3ded9a8 · 3ded9a8
1 parent 2473218
commit 3ded9a8
Show file tree

Hide file tree

Showing 10 changed files with 161 additions and 161 deletions.
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
@@ -5,8 +5,8 @@ namespace Xamarin.Android.Prepare
 {
 	class BuildAndroidPlatforms
 	{
-		public const string AndroidNdkVersion = "24";
-		public const string AndroidNdkPkgRevision = "24.0.8215888";
+		public const string AndroidNdkVersion = "25";
+		public const string AndroidNdkPkgRevision = "25.0.8775105";
 		public const int NdkMinimumAPI = 21;
 		public const int NdkMinimumAPILegacy32 = 19;
 

diff --git a/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
@@ -8,7 +8,7 @@
       "Size": 58756
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 88005
+      "Size": 87933
     },
     "assemblies/rc.bin": {
       "Size": 1129
@@ -20,19 +20,19 @@
       "Size": 9083
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 473327
+      "Size": 473290
     },
     "assemblies/System.Runtime.dll": {
       "Size": 2379
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 3602
+      "Size": 3597
     },
     "classes.dex": {
       "Size": 360744
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 512648
+      "Size": 425336
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
       "Size": 3084552
@@ -47,7 +47,7 @@
       "Size": 148696
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 9528
+      "Size": 9488
     },
     "META-INF/BNDLTOOL.RSA": {
       "Size": 1213
@@ -59,7 +59,7 @@
       "Size": 2443
     },
     "res/drawable-hdpi-v4/icon.png": {
-      "Size": 4762
+      "Size": 4791
     },
     "res/drawable-mdpi-v4/icon.png": {
       "Size": 2200
@@ -83,5 +83,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 2680799
+  "PackageSize": 2648031
 }
diff --git a/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleLegacy.apkdesc b/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleLegacy.apkdesc
@@ -5,22 +5,22 @@
       "Size": 2604
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 68903
+      "Size": 68921
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 259892
+      "Size": 259883
     },
     "assemblies/mscorlib.dll": {
       "Size": 769017
     },
     "assemblies/System.Core.dll": {
-      "Size": 28198
+      "Size": 28199
     },
     "assemblies/System.dll": {
-      "Size": 9180
+      "Size": 9179
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 2881
+      "Size": 2877
     },
     "classes.dex": {
       "Size": 362940
@@ -32,13 +32,13 @@
       "Size": 750976
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 423048
+      "Size": 332128
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
       "Size": 4051864
     },
     "lib/arm64-v8a/libxa-internal-api.so": {
-      "Size": 65512
+      "Size": 66184
     },
     "lib/arm64-v8a/libxamarin-app.so": {
       "Size": 20240
@@ -74,5 +74,5 @@
       "Size": 1724
     }
   },
-  "PackageSize": 4060884
+  "PackageSize": 4028116
 }
diff --git a/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc b/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
@@ -11,7 +11,7 @@
       "Size": 66630
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 442072
+      "Size": 441986
     },
     "assemblies/mscorlib.dll": {
       "Size": 3849
@@ -83,7 +83,7 @@
       "Size": 8095
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 808212
+      "Size": 808082
     },
     "assemblies/System.Private.DataContractSerialization.dll": {
       "Size": 184896
@@ -122,7 +122,7 @@
       "Size": 1846
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 117277
+      "Size": 117278
     },
     "assemblies/Xamarin.AndroidX.Activity.dll": {
       "Size": 5872
@@ -194,7 +194,7 @@
       "Size": 3473216
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 512648
+      "Size": 425336
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
       "Size": 3084552
@@ -209,7 +209,7 @@
       "Size": 148696
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 98952
+      "Size": 98912
     },
     "META-INF/android.support.design_material.version": {
       "Size": 12
@@ -776,7 +776,7 @@
       "Size": 470
     },
     "res/drawable-hdpi-v4/icon.png": {
-      "Size": 4762
+      "Size": 4791
     },
     "res/drawable-hdpi-v4/notification_bg_low_normal.9.png": {
       "Size": 212
@@ -1964,5 +1964,5 @@
       "Size": 341228
     }
   },
-  "PackageSize": 8040857
+  "PackageSize": 8008089
 }
diff --git a/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsLegacy.apkdesc b/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsLegacy.apkdesc
@@ -8,10 +8,10 @@
       "Size": 7215
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 69921
+      "Size": 69945
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 570610
+      "Size": 570605
     },
     "assemblies/Mono.Security.dll": {
       "Size": 68433
@@ -32,7 +32,7 @@
       "Size": 110693
     },
     "assemblies/System.Numerics.dll": {
-      "Size": 15683
+      "Size": 15682
     },
     "assemblies/System.Runtime.Serialization.dll": {
       "Size": 186660
@@ -44,7 +44,7 @@
       "Size": 395656
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 116898
+      "Size": 116896
     },
     "assemblies/Xamarin.AndroidX.Activity.dll": {
       "Size": 7697
@@ -86,7 +86,7 @@
       "Size": 13585
     },
     "assemblies/Xamarin.AndroidX.RecyclerView.dll": {
-      "Size": 102326
+      "Size": 102327
     },
     "assemblies/Xamarin.AndroidX.SavedState.dll": {
       "Size": 6268
@@ -95,7 +95,7 @@
       "Size": 11272
     },
     "assemblies/Xamarin.AndroidX.ViewPager.dll": {
-      "Size": 19424
+      "Size": 19423
     },
     "assemblies/Xamarin.Forms.Core.dll": {
       "Size": 524736
@@ -122,13 +122,13 @@
       "Size": 750976
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 423048
+      "Size": 332128
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
       "Size": 4051864
     },
     "lib/arm64-v8a/libxa-internal-api.so": {
-      "Size": 65512
+      "Size": 66184
     },
     "lib/arm64-v8a/libxamarin-app.so": {
       "Size": 105288
@@ -1883,5 +1883,5 @@
       "Size": 341040
     }
   },
-  "PackageSize": 9582750
+  "PackageSize": 9545886
 }