Add AndroidLinkResources argument

Author: dellis1972

src/Microsoft.Android.Sdk.ILLink/SetupStep.cs

@@ -56,8 +56,11 @@ protected override void Process ()
 			if (Context.TryGetCustomData ("AddKeepAlivesStep", out addKeepAlivesStep) && bool.TryParse (addKeepAlivesStep, out var bv) && bv)
 				InsertAfter (new AddKeepAlivesStep (cache), "CleanStep");
 
-			InsertAfter (new RemoveResourceDesignerStep (),  "CleanStep");
-			InsertAfter (new GetAssembliesStep (), "CleanStep");
+			string androidLinkResources;
+			if (Context.TryGetCustomData ("AndroidLinkResources", out androidLinkResources) && bool.TryParse (androidLinkResources, out var linkResources) && linkResources) {
+				InsertAfter (new RemoveResourceDesignerStep (),  "CleanStep");
+				InsertAfter (new GetAssembliesStep (), "CleanStep");
+			}
 			InsertAfter (new StripEmbeddedLibraries (),  "CleanStep");
 		}
 

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/Linker.cs

@@ -122,8 +122,11 @@ static Pipeline CreatePipeline (LinkerOptions options)
 			pipeline.AppendStep (new StripEmbeddedLibraries ());
 			if (options.AddKeepAlives)
 				pipeline.AppendStep (new AddKeepAlivesStep (cache));
-			pipeline.AppendStep (new GetAssembliesStep ());
-			pipeline.AppendStep (new RemoveResourceDesignerStep ());
+
+			if (options.LinkResources) {
+				pipeline.AppendStep (new GetAssembliesStep ());
+				pipeline.AppendStep (new RemoveResourceDesignerStep ());
+			}
 			// end monodroid specific
 			pipeline.AppendStep (new RegenerateGuidStep ());
 			pipeline.AppendStep (new OutputStepWithTimestamps ());

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/LinkerOptions.cs

@@ -25,5 +25,6 @@ class LinkerOptions
 		public bool AddKeepAlives { get; set; }
 		public bool PreserveJniMarshalMethods { get; set; }
 		public bool DeterministicOutput { get; set; }
+		public bool LinkResources { get; set; }
 	}
 }

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets

@@ -59,6 +59,10 @@ This file contains the .NET 5-specific targets to customize ILLink
         Condition=" '$(_ProguardProjectConfiguration)' != '' ">
       <_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --custom-data ProguardConfiguration="$(_ProguardProjectConfiguration)"</_ExtraTrimmerArgs>
     </PropertyGroup>
+    <PropertyGroup
+        Condition=" '$(AndroidLinkResources)' != '' ">
+      <_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --custom-data AndroidLinkResources="$(AndroidLinkResources)"</_ExtraTrimmerArgs>
+    </PropertyGroup>
     <PropertyGroup
         Condition=" '$(LinkerDumpDependencies)' == 'true' ">
       <_ExtraTrimmerArgs>--dump-dependencies $(_ExtraTrimmerArgs)"</_ExtraTrimmerArgs>

src/Xamarin.Android.Build.Tasks/Tasks/LinkAssemblies.cs

@@ -55,6 +55,8 @@ public class LinkAssemblies : AndroidTask, ML.ILogger
 
 		public bool Deterministic { get; set; }
 
+		public bool LinkResources { get; set; }
+
 		IEnumerable<AssemblyDefinition> GetRetainAssemblies (DirectoryAssemblyResolver res)
 		{
 			List<AssemblyDefinition> retainList = null;
@@ -105,6 +107,7 @@ bool Execute (DirectoryAssemblyResolver res)
 			options.AddKeepAlives = AddKeepAlives;
 			options.PreserveJniMarshalMethods = PreserveJniMarshalMethods;
 			options.DeterministicOutput = Deterministic;
+			options.LinkResources = LinkResources;
 
 			var skiplist = new List<string> ();
 

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs

@@ -199,6 +199,7 @@ public void RemoveDesigner ()
 				IsRelease = true,
 			};
 			proj.SetProperty ("AndroidEnableAssemblyCompression", "False");
+			proj.SetProperty ("AndroidLinkResources", "True");
 			string assemblyName = proj.ProjectName;
 			using (var b = CreateApkBuilder ()) {
 				Assert.IsTrue (b.Build (proj), "build should have succeeded.");

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

@@ -849,6 +849,7 @@ because xbuild doesn't support framework reference assemblies.
 <Target Name="_CreatePropertiesCache" DependsOnTargets="_SetupDesignTimeBuildForBuild;_SetLatestTargetFrameworkVersion;_ResolveMonoAndroidSdks">
 	<PropertyGroup>
 		<AndroidAddKeepAlives Condition="'$(AndroidAddKeepAlives)' == '' And '$(AndroidIncludeDebugSymbols)' != 'True'">True</AndroidAddKeepAlives>
+    <AndroidLinkResources Condition="'$(AndroidLinkResources)' == '' And '$(AndroidIncludeDebugSymbols)' != 'True'">False</AndroidLinkResources>
 		<_AndroidBuildPropertiesCacheExists Condition=" Exists('$(_AndroidBuildPropertiesCache)') ">True</_AndroidBuildPropertiesCacheExists>
 		<_NuGetAssetsFile      Condition=" Exists('$(ProjectLockFile)') ">$(ProjectLockFile)</_NuGetAssetsFile>
 		<_NuGetAssetsFile      Condition=" '$(_NuGetAssetsFile)' == '' and Exists('packages.config') ">packages.config</_NuGetAssetsFile>
@@ -867,6 +868,7 @@ because xbuild doesn't support framework reference assemblies.
 		<_PropertyCacheItems Include="AndroidEnableProfiledAot=$(AndroidEnableProfiledAot)" />
 		<_PropertyCacheItems Include="AndroidDexTool=$(AndroidDexTool)" />
 		<_PropertyCacheItems Include="AndroidLinkTool=$(AndroidLinkTool)" />
+    <_PropertyCacheItems Include="AndroidLinkResources=$(AndroidLinkResources)" />
 		<_PropertyCacheItems Include="AndroidPackageFormat=$(AndroidPackageFormat)" />
 		<_PropertyCacheItems Include="EmbedAssembliesIntoApk=$(EmbedAssembliesIntoApk)" />
 		<_PropertyCacheItems Include="AndroidLinkMode=$(AndroidLinkMode)" />

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Legacy.targets

@@ -399,7 +399,7 @@ projects. .NET 5 projects will not import this file.
 
   <Target Name="_ConvertDebuggingFiles"
       Inputs="$(OutDir)$(TargetFileName);$(_IntermediatePdbFile)"
-      Outputs="$(OutDir)$(TargetFileName).mdb" 
+      Outputs="$(OutDir)$(TargetFileName).mdb"
       DependsOnTargets="_ValidateAndroidPackageProperties">
     <ConvertDebuggingFiles Files="$(OutDir)$(TargetFileName)" />
     <Touch Files="$(OutDir)$(TargetFileName).mdb" />
@@ -638,6 +638,7 @@ projects. .NET 5 projects will not import this file.
         LinkDescriptions="@(LinkDescription)"
         ProguardConfiguration="$(_ProguardProjectConfiguration)"
         AddKeepAlives="$(AndroidAddKeepAlives)"
+        LinkResources="$(AndroidLinkResources)"
         PreserveJniMarshalMethods="$(AndroidGenerateJniMarshalMethods)"
         EnableProguard="$(AndroidEnableProguard)"
         Deterministic="$(Deterministic)"