Skip to content

Commit 3ded9a8

Browse files
grendellogrendello
authored
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.
1 parent 2473218 commit 3ded9a8

10 files changed

+161
-161
lines changed

‎build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ namespace Xamarin.Android.Prepare
55
{
66
class BuildAndroidPlatforms
77
{
8-
public const string AndroidNdkVersion = "24";
9-
public const string AndroidNdkPkgRevision = "24.0.8215888";
8+
public const string AndroidNdkVersion = "25";
9+
public const string AndroidNdkPkgRevision = "25.0.8775105";
1010
public const int NdkMinimumAPI = 21;
1111
public const int NdkMinimumAPILegacy32 = 19;
1212

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"Size": 58756
99
},
1010
"assemblies/Mono.Android.dll": {
11-
"Size": 88005
11+
"Size": 87933
1212
},
1313
"assemblies/rc.bin": {
1414
"Size": 1129
@@ -20,19 +20,19 @@
2020
"Size": 9083
2121
},
2222
"assemblies/System.Private.CoreLib.dll": {
23-
"Size": 473327
23+
"Size": 473290
2424
},
2525
"assemblies/System.Runtime.dll": {
2626
"Size": 2379
2727
},
2828
"assemblies/UnnamedProject.dll": {
29-
"Size": 3602
29+
"Size": 3597
3030
},
3131
"classes.dex": {
3232
"Size": 360744
3333
},
3434
"lib/arm64-v8a/libmonodroid.so": {
35-
"Size": 512648
35+
"Size": 425336
3636
},
3737
"lib/arm64-v8a/libmonosgen-2.0.so": {
3838
"Size": 3084552
@@ -47,7 +47,7 @@
4747
"Size": 148696
4848
},
4949
"lib/arm64-v8a/libxamarin-app.so": {
50-
"Size": 9528
50+
"Size": 9488
5151
},
5252
"META-INF/BNDLTOOL.RSA": {
5353
"Size": 1213
@@ -59,7 +59,7 @@
5959
"Size": 2443
6060
},
6161
"res/drawable-hdpi-v4/icon.png": {
62-
"Size": 4762
62+
"Size": 4791
6363
},
6464
"res/drawable-mdpi-v4/icon.png": {
6565
"Size": 2200
@@ -83,5 +83,5 @@
8383
"Size": 1904
8484
}
8585
},
86-
"PackageSize": 2680799
86+
"PackageSize": 2648031
8787
}

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleLegacy.apkdesc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
"Size": 2604
66
},
77
"assemblies/Java.Interop.dll": {
8-
"Size": 68903
8+
"Size": 68921
99
},
1010
"assemblies/Mono.Android.dll": {
11-
"Size": 259892
11+
"Size": 259883
1212
},
1313
"assemblies/mscorlib.dll": {
1414
"Size": 769017
1515
},
1616
"assemblies/System.Core.dll": {
17-
"Size": 28198
17+
"Size": 28199
1818
},
1919
"assemblies/System.dll": {
20-
"Size": 9180
20+
"Size": 9179
2121
},
2222
"assemblies/UnnamedProject.dll": {
23-
"Size": 2881
23+
"Size": 2877
2424
},
2525
"classes.dex": {
2626
"Size": 362940
@@ -32,13 +32,13 @@
3232
"Size": 750976
3333
},
3434
"lib/arm64-v8a/libmonodroid.so": {
35-
"Size": 423048
35+
"Size": 332128
3636
},
3737
"lib/arm64-v8a/libmonosgen-2.0.so": {
3838
"Size": 4051864
3939
},
4040
"lib/arm64-v8a/libxa-internal-api.so": {
41-
"Size": 65512
41+
"Size": 66184
4242
},
4343
"lib/arm64-v8a/libxamarin-app.so": {
4444
"Size": 20240
@@ -74,5 +74,5 @@
7474
"Size": 1724
7575
}
7676
},
77-
"PackageSize": 4060884
77+
"PackageSize": 4028116
7878
}

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"Size": 66630
1212
},
1313
"assemblies/Mono.Android.dll": {
14-
"Size": 442072
14+
"Size": 441986
1515
},
1616
"assemblies/mscorlib.dll": {
1717
"Size": 3849
@@ -83,7 +83,7 @@
8383
"Size": 8095
8484
},
8585
"assemblies/System.Private.CoreLib.dll": {
86-
"Size": 808212
86+
"Size": 808082
8787
},
8888
"assemblies/System.Private.DataContractSerialization.dll": {
8989
"Size": 184896
@@ -122,7 +122,7 @@
122122
"Size": 1846
123123
},
124124
"assemblies/UnnamedProject.dll": {
125-
"Size": 117277
125+
"Size": 117278
126126
},
127127
"assemblies/Xamarin.AndroidX.Activity.dll": {
128128
"Size": 5872
@@ -194,7 +194,7 @@
194194
"Size": 3473216
195195
},
196196
"lib/arm64-v8a/libmonodroid.so": {
197-
"Size": 512648
197+
"Size": 425336
198198
},
199199
"lib/arm64-v8a/libmonosgen-2.0.so": {
200200
"Size": 3084552
@@ -209,7 +209,7 @@
209209
"Size": 148696
210210
},
211211
"lib/arm64-v8a/libxamarin-app.so": {
212-
"Size": 98952
212+
"Size": 98912
213213
},
214214
"META-INF/android.support.design_material.version": {
215215
"Size": 12
@@ -776,7 +776,7 @@
776776
"Size": 470
777777
},
778778
"res/drawable-hdpi-v4/icon.png": {
779-
"Size": 4762
779+
"Size": 4791
780780
},
781781
"res/drawable-hdpi-v4/notification_bg_low_normal.9.png": {
782782
"Size": 212
@@ -1964,5 +1964,5 @@
19641964
"Size": 341228
19651965
}
19661966
},
1967-
"PackageSize": 8040857
1967+
"PackageSize": 8008089
19681968
}

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsLegacy.apkdesc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"Size": 7215
99
},
1010
"assemblies/Java.Interop.dll": {
11-
"Size": 69921
11+
"Size": 69945
1212
},
1313
"assemblies/Mono.Android.dll": {
14-
"Size": 570610
14+
"Size": 570605
1515
},
1616
"assemblies/Mono.Security.dll": {
1717
"Size": 68433
@@ -32,7 +32,7 @@
3232
"Size": 110693
3333
},
3434
"assemblies/System.Numerics.dll": {
35-
"Size": 15683
35+
"Size": 15682
3636
},
3737
"assemblies/System.Runtime.Serialization.dll": {
3838
"Size": 186660
@@ -44,7 +44,7 @@
4444
"Size": 395656
4545
},
4646
"assemblies/UnnamedProject.dll": {
47-
"Size": 116898
47+
"Size": 116896
4848
},
4949
"assemblies/Xamarin.AndroidX.Activity.dll": {
5050
"Size": 7697
@@ -86,7 +86,7 @@
8686
"Size": 13585
8787
},
8888
"assemblies/Xamarin.AndroidX.RecyclerView.dll": {
89-
"Size": 102326
89+
"Size": 102327
9090
},
9191
"assemblies/Xamarin.AndroidX.SavedState.dll": {
9292
"Size": 6268
@@ -95,7 +95,7 @@
9595
"Size": 11272
9696
},
9797
"assemblies/Xamarin.AndroidX.ViewPager.dll": {
98-
"Size": 19424
98+
"Size": 19423
9999
},
100100
"assemblies/Xamarin.Forms.Core.dll": {
101101
"Size": 524736
@@ -122,13 +122,13 @@
122122
"Size": 750976
123123
},
124124
"lib/arm64-v8a/libmonodroid.so": {
125-
"Size": 423048
125+
"Size": 332128
126126
},
127127
"lib/arm64-v8a/libmonosgen-2.0.so": {
128128
"Size": 4051864
129129
},
130130
"lib/arm64-v8a/libxa-internal-api.so": {
131-
"Size": 65512
131+
"Size": 66184
132132
},
133133
"lib/arm64-v8a/libxamarin-app.so": {
134134
"Size": 105288
@@ -1883,5 +1883,5 @@
18831883
"Size": 341040
18841884
}
18851885
},
1886-
"PackageSize": 9582750
1886+
"PackageSize": 9545886
18871887
}

0 commit comments

Comments
 (0)