Skip to content

Commit b541ca5

Browse files
grendellogrendello
committed
[WIP] Fixes for some of the failing tests
1 parent 799295d commit b541ca5

File tree

5 files changed

+70
-95
lines changed

5 files changed

+70
-95
lines changed

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ public sealed class ApplicationConfig
6161
public uint jnienv_initialize_method_token;
6262
public uint jnienv_registerjninatives_method_token;
6363
public uint mono_components_mask;
64+
public uint mam_replacement_type_count;
65+
public uint mam_replacement_method_index_entry_count;
6466
public string android_package_name;
6567
};
66-
const uint ApplicationConfigFieldCount = 23;
68+
const uint ApplicationConfigFieldCount = 25;
6769

6870
const string ApplicationConfigSymbolName = "application_config";
6971
const string AppEnvironmentVariablesSymbolName = "app_environment_variables";
@@ -312,7 +314,17 @@ static ApplicationConfig ReadApplicationConfig (EnvironmentFile envFile)
312314
ret.mono_components_mask = ConvertFieldToUInt32 ("mono_components_mask", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
313315
break;
314316

315-
case 22: // android_package_name: string / [pointer type]
317+
case 22: // mam_replacement_type_count: uint32_t / .word | .long
318+
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
319+
ret.mam_replacement_type_count = ConvertFieldToUInt32 ("mam_replacement_type_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
320+
break;
321+
322+
case 23: // mam_replacement_method_index_entry_count: uint32_t / .word | .long
323+
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
324+
ret.mam_replacement_method_index_entry_count = ConvertFieldToUInt32 ("mam_replacement_method_index_entry_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
325+
break;
326+
327+
case 24: // android_package_name: string / [pointer type]
316328
Assert.IsTrue (expectedPointerTypes.Contains (field [0]), $"Unexpected pointer field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
317329
pointers.Add (field [1].Trim ());
318330
break;

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

Lines changed: 13 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,67 +5,34 @@
55
"Size": 3032
66
},
77
"assemblies/Java.Interop.dll": {
8-
"Size": 60736
8+
"Size": 59437
99
},
1010
"assemblies/Mono.Android.dll": {
11-
"Size": 152435
11+
"Size": 89041
1212
},
1313
"assemblies/rc.bin": {
1414
"Size": 1083
1515
},
16-
"assemblies/System.Collections.Concurrent.dll": {
17-
"Size": 8757
18-
},
19-
"assemblies/System.Collections.dll": {
20-
"Size": 4196
21-
},
22-
"assemblies/System.Collections.NonGeneric.dll": {
23-
"Size": 6232
24-
},
2516
"assemblies/System.Console.dll": {
26-
"Size": 6502
27-
},
28-
"assemblies/System.IO.Compression.dll": {
29-
"Size": 16259
17+
"Size": 6475
3018
},
3119
"assemblies/System.Linq.dll": {
32-
"Size": 10183
33-
},
34-
"assemblies/System.Net.Http.dll": {
35-
"Size": 65104
36-
},
37-
"assemblies/System.Net.Primitives.dll": {
38-
"Size": 21115
39-
},
40-
"assemblies/System.Net.Requests.dll": {
41-
"Size": 3515
20+
"Size": 9971
4221
},
4322
"assemblies/System.Private.CoreLib.dll": {
44-
"Size": 613751
45-
},
46-
"assemblies/System.Private.Uri.dll": {
47-
"Size": 37595
48-
},
49-
"assemblies/System.Private.Xml.dll": {
50-
"Size": 140804
23+
"Size": 524995
5124
},
5225
"assemblies/System.Runtime.dll": {
53-
"Size": 2405
54-
},
55-
"assemblies/System.Security.Cryptography.dll": {
56-
"Size": 7391
57-
},
58-
"assemblies/System.Text.RegularExpressions.dll": {
59-
"Size": 9591
26+
"Size": 2410
6027
},
6128
"assemblies/UnnamedProject.dll": {
62-
"Size": 3560
29+
"Size": 3557
6330
},
6431
"classes.dex": {
65-
"Size": 348440
32+
"Size": 347544
6633
},
6734
"lib/arm64-v8a/libmonodroid.so": {
68-
"Size": 484512
35+
"Size": 485896
6936
},
7037
"lib/arm64-v8a/libmonosgen-2.0.so": {
7138
"Size": 4667768
@@ -80,16 +47,16 @@
8047
"Size": 146816
8148
},
8249
"lib/arm64-v8a/libxamarin-app.so": {
83-
"Size": 15944
50+
"Size": 9344
8451
},
8552
"META-INF/BNDLTOOL.RSA": {
8653
"Size": 1213
8754
},
8855
"META-INF/BNDLTOOL.SF": {
89-
"Size": 3773
56+
"Size": 2570
9057
},
9158
"META-INF/MANIFEST.MF": {
92-
"Size": 3646
59+
"Size": 2443
9360
},
9461
"res/drawable-hdpi-v4/icon.png": {
9562
"Size": 4762
@@ -116,5 +83,5 @@
11683
"Size": 1904
11784
}
11885
},
119-
"PackageSize": 3492724
86+
"PackageSize": 3012575
12087
}

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

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,118 +8,118 @@
88
"Size": 7114
99
},
1010
"assemblies/Java.Interop.dll": {
11-
"Size": 66806
11+
"Size": 66822
1212
},
1313
"assemblies/Mono.Android.dll": {
14-
"Size": 447633
14+
"Size": 444764
1515
},
1616
"assemblies/mscorlib.dll": {
17-
"Size": 3888
17+
"Size": 3891
1818
},
1919
"assemblies/netstandard.dll": {
20-
"Size": 5601
20+
"Size": 5602
2121
},
2222
"assemblies/rc.bin": {
2323
"Size": 1083
2424
},
2525
"assemblies/System.Collections.Concurrent.dll": {
26-
"Size": 10772
26+
"Size": 10777
2727
},
2828
"assemblies/System.Collections.dll": {
29-
"Size": 16149
29+
"Size": 16153
3030
},
3131
"assemblies/System.Collections.NonGeneric.dll": {
32-
"Size": 7926
32+
"Size": 7932
3333
},
3434
"assemblies/System.ComponentModel.dll": {
35-
"Size": 2010
35+
"Size": 2014
3636
},
3737
"assemblies/System.ComponentModel.Primitives.dll": {
38-
"Size": 2623
38+
"Size": 2627
3939
},
4040
"assemblies/System.ComponentModel.TypeConverter.dll": {
41-
"Size": 6101
41+
"Size": 6106
4242
},
4343
"assemblies/System.Console.dll": {
44-
"Size": 6673
44+
"Size": 6677
4545
},
4646
"assemblies/System.Core.dll": {
47-
"Size": 2052
47+
"Size": 2055
4848
},
4949
"assemblies/System.Diagnostics.TraceSource.dll": {
50-
"Size": 6569
50+
"Size": 6573
5151
},
5252
"assemblies/System.dll": {
53-
"Size": 2407
53+
"Size": 2409
5454
},
5555
"assemblies/System.Drawing.dll": {
56-
"Size": 2088
56+
"Size": 2093
5757
},
5858
"assemblies/System.Drawing.Primitives.dll": {
59-
"Size": 12120
59+
"Size": 12123
6060
},
6161
"assemblies/System.IO.Compression.dll": {
62-
"Size": 16734
62+
"Size": 16741
6363
},
6464
"assemblies/System.IO.IsolatedStorage.dll": {
65-
"Size": 10043
65+
"Size": 10045
6666
},
6767
"assemblies/System.Linq.dll": {
68-
"Size": 19792
68+
"Size": 19801
6969
},
7070
"assemblies/System.Linq.Expressions.dll": {
71-
"Size": 177468
71+
"Size": 177473
7272
},
7373
"assemblies/System.Net.Http.dll": {
74-
"Size": 65646
74+
"Size": 65645
7575
},
7676
"assemblies/System.Net.Primitives.dll": {
77-
"Size": 22062
77+
"Size": 22070
7878
},
7979
"assemblies/System.Net.Requests.dll": {
80-
"Size": 3657
80+
"Size": 3660
8181
},
8282
"assemblies/System.ObjectModel.dll": {
83-
"Size": 8537
83+
"Size": 8540
8484
},
8585
"assemblies/System.Private.CoreLib.dll": {
86-
"Size": 800853
86+
"Size": 800901
8787
},
8888
"assemblies/System.Private.DataContractSerialization.dll": {
89-
"Size": 185392
89+
"Size": 185328
9090
},
9191
"assemblies/System.Private.Uri.dll": {
92-
"Size": 42654
92+
"Size": 42655
9393
},
9494
"assemblies/System.Private.Xml.dll": {
95-
"Size": 221849
95+
"Size": 216473
9696
},
9797
"assemblies/System.Private.Xml.Linq.dll": {
98-
"Size": 16692
98+
"Size": 16698
9999
},
100100
"assemblies/System.Runtime.dll": {
101-
"Size": 2598
101+
"Size": 2603
102102
},
103103
"assemblies/System.Runtime.Serialization.dll": {
104-
"Size": 2016
104+
"Size": 2020
105105
},
106106
"assemblies/System.Runtime.Serialization.Formatters.dll": {
107-
"Size": 2546
107+
"Size": 2551
108108
},
109109
"assemblies/System.Runtime.Serialization.Primitives.dll": {
110-
"Size": 3829
110+
"Size": 3834
111111
},
112112
"assemblies/System.Security.Cryptography.dll": {
113-
"Size": 7748
113+
"Size": 7751
114114
},
115115
"assemblies/System.Text.RegularExpressions.dll": {
116-
"Size": 159574
116+
"Size": 159573
117117
},
118118
"assemblies/System.Xml.dll": {
119-
"Size": 1906
119+
"Size": 1910
120120
},
121121
"assemblies/UnnamedProject.dll": {
122-
"Size": 117250
122+
"Size": 117249
123123
},
124124
"assemblies/Xamarin.AndroidX.Activity.dll": {
125125
"Size": 5941
@@ -188,10 +188,10 @@
188188
"Size": 40004
189189
},
190190
"classes.dex": {
191-
"Size": 3460820
191+
"Size": 3460156
192192
},
193193
"lib/arm64-v8a/libmonodroid.so": {
194-
"Size": 484512
194+
"Size": 485896
195195
},
196196
"lib/arm64-v8a/libmonosgen-2.0.so": {
197197
"Size": 4667768
@@ -206,7 +206,7 @@
206206
"Size": 146816
207207
},
208208
"lib/arm64-v8a/libxamarin-app.so": {
209-
"Size": 98480
209+
"Size": 98448
210210
},
211211
"META-INF/android.support.design_material.version": {
212212
"Size": 12
@@ -1961,5 +1961,5 @@
19611961
"Size": 341228
19621962
}
19631963
},
1964-
"PackageSize": 8347981
1964+
"PackageSize": 8339789
19651965
}

‎src/Xamarin.Android.Build.Tasks/Utilities/MamRemappingAssemblyGenerator.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.IO;
43
using System.Text;
54

6-
using Microsoft.Build.Framework;
7-
using Microsoft.Build.Utilities;
8-
95
using Xamarin.Android.Tasks.LLVMIR;
106

117
namespace Xamarin.Android.Tasks

‎src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,9 +1626,10 @@ because xbuild doesn't support framework reference assemblies.
16261626
</PrepareAbiItems>
16271627
</Target>
16281628

1629-
<Target Name="_GenerateEmptyAndroidRemapNativeCode"
1629+
<Target Name="_GenerateAndroidRemapNativeCode"
16301630
DependsOnTargets="_PrepareAndroidRemapNativeAssemblySources"
16311631
Condition=" '@(_AndroidRemapMembers->Count())' == '0' "
1632+
Inputs="$(MSBuildProjectFullPath)"
16321633
Outputs="@(_AndroidRemapAssemblySource)">
16331634
<GenerateMamNativeCode
16341635
OutputDirectory="$(_NativeAssemblySourceDir)"
@@ -1662,7 +1663,6 @@ because xbuild doesn't support framework reference assemblies.
16621663
_PrepareEnvironmentAssemblySources;
16631664
_GenerateEnvironmentFiles;
16641665
_GenerateAndroidRemapNativeCode;
1665-
_GenerateEmptyAndroidRemapNativeCode;
16661666
_IncludeNativeSystemLibraries;
16671667
</_GeneratePackageManagerJavaDependsOn>
16681668
</PropertyGroup>

0 commit comments

Comments
 (0)