[WIP] Fixes for some of the failing tests

dotnet · Jun 2, 2022 · b541ca5 · b541ca5
1 parent 799295d
commit b541ca5
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 95 deletions.
diff --git a/...arin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs b/...arin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs
@@ -61,9 +61,11 @@ public sealed class ApplicationConfig
 			public uint   jnienv_initialize_method_token;
 			public uint   jnienv_registerjninatives_method_token;
 			public uint   mono_components_mask;
+			public uint   mam_replacement_type_count;
+			public uint   mam_replacement_method_index_entry_count;
 			public string android_package_name;
 		};
-		const uint ApplicationConfigFieldCount = 23;
+		const uint ApplicationConfigFieldCount = 25;
 
 		const string ApplicationConfigSymbolName = "application_config";
 		const string AppEnvironmentVariablesSymbolName = "app_environment_variables";
@@ -312,7 +314,17 @@ static ApplicationConfig ReadApplicationConfig (EnvironmentFile envFile)
 						ret.mono_components_mask = ConvertFieldToUInt32 ("mono_components_mask", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 22: // android_package_name: string / [pointer type]
+					case 22: // mam_replacement_type_count: uint32_t / .word | .long
+						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
+						ret.mam_replacement_type_count = ConvertFieldToUInt32 ("mam_replacement_type_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
+						break;
+
+					case 23: // mam_replacement_method_index_entry_count: uint32_t / .word | .long
+						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
+						ret.mam_replacement_method_index_entry_count = ConvertFieldToUInt32 ("mam_replacement_method_index_entry_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
+						break;
+
+					case 24: // android_package_name: string / [pointer type]
 						Assert.IsTrue (expectedPointerTypes.Contains (field [0]), $"Unexpected pointer field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						pointers.Add (field [1].Trim ());
 						break;

diff --git a/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
@@ -5,67 +5,34 @@
       "Size": 3032
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 60736
+      "Size": 59437
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 152435
+      "Size": 89041
     },
     "assemblies/rc.bin": {
       "Size": 1083
     },
-    "assemblies/System.Collections.Concurrent.dll": {
-      "Size": 8757
-    },
-    "assemblies/System.Collections.dll": {
-      "Size": 4196
-    },
-    "assemblies/System.Collections.NonGeneric.dll": {
-      "Size": 6232
-    },
     "assemblies/System.Console.dll": {
-      "Size": 6502
-    },
-    "assemblies/System.IO.Compression.dll": {
-      "Size": 16259
+      "Size": 6475
     },
     "assemblies/System.Linq.dll": {
-      "Size": 10183
-    },
-    "assemblies/System.Net.Http.dll": {
-      "Size": 65104
-    },
-    "assemblies/System.Net.Primitives.dll": {
-      "Size": 21115
-    },
-    "assemblies/System.Net.Requests.dll": {
-      "Size": 3515
+      "Size": 9971
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 613751
-    },
-    "assemblies/System.Private.Uri.dll": {
-      "Size": 37595
-    },
-    "assemblies/System.Private.Xml.dll": {
-      "Size": 140804
+      "Size": 524995
     },
     "assemblies/System.Runtime.dll": {
-      "Size": 2405
-    },
-    "assemblies/System.Security.Cryptography.dll": {
-      "Size": 7391
-    },
-    "assemblies/System.Text.RegularExpressions.dll": {
-      "Size": 9591
+      "Size": 2410
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 3560
+      "Size": 3557
     },
     "classes.dex": {
-      "Size": 348440
+      "Size": 347544
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 484512
+      "Size": 485896
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
       "Size": 4667768
@@ -80,16 +47,16 @@
       "Size": 146816
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 15944
+      "Size": 9344
     },
     "META-INF/BNDLTOOL.RSA": {
       "Size": 1213
     },
     "META-INF/BNDLTOOL.SF": {
-      "Size": 3773
+      "Size": 2570
     },
     "META-INF/MANIFEST.MF": {
-      "Size": 3646
+      "Size": 2443
     },
     "res/drawable-hdpi-v4/icon.png": {
       "Size": 4762
@@ -116,5 +83,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 3492724
+  "PackageSize": 3012575
 }
diff --git a/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc b/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
@@ -8,118 +8,118 @@
       "Size": 7114
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 66806
+      "Size": 66822
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 447633
+      "Size": 444764
     },
     "assemblies/mscorlib.dll": {
-      "Size": 3888
+      "Size": 3891
     },
     "assemblies/netstandard.dll": {
-      "Size": 5601
+      "Size": 5602
     },
     "assemblies/rc.bin": {
       "Size": 1083
     },
     "assemblies/System.Collections.Concurrent.dll": {
-      "Size": 10772
+      "Size": 10777
     },
     "assemblies/System.Collections.dll": {
-      "Size": 16149
+      "Size": 16153
     },
     "assemblies/System.Collections.NonGeneric.dll": {
-      "Size": 7926
+      "Size": 7932
     },
     "assemblies/System.ComponentModel.dll": {
-      "Size": 2010
+      "Size": 2014
     },
     "assemblies/System.ComponentModel.Primitives.dll": {
-      "Size": 2623
+      "Size": 2627
     },
     "assemblies/System.ComponentModel.TypeConverter.dll": {
-      "Size": 6101
+      "Size": 6106
     },
     "assemblies/System.Console.dll": {
-      "Size": 6673
+      "Size": 6677
     },
     "assemblies/System.Core.dll": {
-      "Size": 2052
+      "Size": 2055
     },
     "assemblies/System.Diagnostics.TraceSource.dll": {
-      "Size": 6569
+      "Size": 6573
     },
     "assemblies/System.dll": {
-      "Size": 2407
+      "Size": 2409
     },
     "assemblies/System.Drawing.dll": {
-      "Size": 2088
+      "Size": 2093
     },
     "assemblies/System.Drawing.Primitives.dll": {
-      "Size": 12120
+      "Size": 12123
     },
     "assemblies/System.IO.Compression.dll": {
-      "Size": 16734
+      "Size": 16741
     },
     "assemblies/System.IO.IsolatedStorage.dll": {
-      "Size": 10043
+      "Size": 10045
     },
     "assemblies/System.Linq.dll": {
-      "Size": 19792
+      "Size": 19801
     },
     "assemblies/System.Linq.Expressions.dll": {
-      "Size": 177468
+      "Size": 177473
     },
     "assemblies/System.Net.Http.dll": {
-      "Size": 65646
+      "Size": 65645
     },
     "assemblies/System.Net.Primitives.dll": {
-      "Size": 22062
+      "Size": 22070
     },
     "assemblies/System.Net.Requests.dll": {
-      "Size": 3657
+      "Size": 3660
     },
     "assemblies/System.ObjectModel.dll": {
-      "Size": 8537
+      "Size": 8540
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 800853
+      "Size": 800901
     },
     "assemblies/System.Private.DataContractSerialization.dll": {
-      "Size": 185392
+      "Size": 185328
     },
     "assemblies/System.Private.Uri.dll": {
-      "Size": 42654
+      "Size": 42655
     },
     "assemblies/System.Private.Xml.dll": {
-      "Size": 221849
+      "Size": 216473
     },
     "assemblies/System.Private.Xml.Linq.dll": {
-      "Size": 16692
+      "Size": 16698
     },
     "assemblies/System.Runtime.dll": {
-      "Size": 2598
+      "Size": 2603
     },
     "assemblies/System.Runtime.Serialization.dll": {
-      "Size": 2016
+      "Size": 2020
     },
     "assemblies/System.Runtime.Serialization.Formatters.dll": {
-      "Size": 2546
+      "Size": 2551
     },
     "assemblies/System.Runtime.Serialization.Primitives.dll": {
-      "Size": 3829
+      "Size": 3834
     },
     "assemblies/System.Security.Cryptography.dll": {
-      "Size": 7748
+      "Size": 7751
     },
     "assemblies/System.Text.RegularExpressions.dll": {
-      "Size": 159574
+      "Size": 159573
     },
     "assemblies/System.Xml.dll": {
-      "Size": 1906
+      "Size": 1910
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 117250
+      "Size": 117249
     },
     "assemblies/Xamarin.AndroidX.Activity.dll": {
       "Size": 5941
@@ -188,10 +188,10 @@
       "Size": 40004
     },
     "classes.dex": {
-      "Size": 3460820
+      "Size": 3460156
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 484512
+      "Size": 485896
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
       "Size": 4667768
@@ -206,7 +206,7 @@
       "Size": 146816
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 98480
+      "Size": 98448
     },
     "META-INF/android.support.design_material.version": {
       "Size": 12
@@ -1961,5 +1961,5 @@
       "Size": 341228
     }
   },
-  "PackageSize": 8347981
+  "PackageSize": 8339789
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MamRemappingAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MamRemappingAssemblyGenerator.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text;
 
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
 using Xamarin.Android.Tasks.LLVMIR;
 
 namespace Xamarin.Android.Tasks

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -1626,9 +1626,10 @@ because xbuild doesn't support framework reference assemblies.
   </PrepareAbiItems>
 </Target>
 
-<Target Name="_GenerateEmptyAndroidRemapNativeCode"
+<Target Name="_GenerateAndroidRemapNativeCode"
         DependsOnTargets="_PrepareAndroidRemapNativeAssemblySources"
         Condition=" '@(_AndroidRemapMembers->Count())' == '0' "
+        Inputs="$(MSBuildProjectFullPath)"
         Outputs="@(_AndroidRemapAssemblySource)">
   <GenerateMamNativeCode
       OutputDirectory="$(_NativeAssemblySourceDir)"
@@ -1662,7 +1663,6 @@ because xbuild doesn't support framework reference assemblies.
     _PrepareEnvironmentAssemblySources;
     _GenerateEnvironmentFiles;
     _GenerateAndroidRemapNativeCode;
-    _GenerateEmptyAndroidRemapNativeCode;
     _IncludeNativeSystemLibraries;
   </_GeneratePackageManagerJavaDependsOn>
 </PropertyGroup>