Skip to content

Commit ac14713

Browse files
committed
Remove call to CollectAssemblyFilesForArchive for Fast Deployment.
Commit 6b91b04 split up the BuildApk task into their own Tasks to improve build performance. In that change the call to `CollectAssemblyFilesForArchive` was a no-op if `EmbedAssembliesIntoApk` was set to `False`. However it was still being called in the `_BuildApkFastDev` target, even though it had a condition which would skip the target entirely if `EmbedAssembliesIntoApk` was `False`. So lets remove the call to `CollectAssemblyFilesForArchive` from `_BuildApkFastDev` completely. We can also remove the `EmbedAssemblies` property from the `CollectAssemblyFilesForArchive` task as it is no longer needed.
1 parent 6b37563 commit ac14713

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ public class CollectAssemblyFilesForArchive : AndroidTask
2929
[Required]
3030
public string AppSharedLibrariesDir { get; set; } = "";
3131

32-
public bool EmbedAssemblies { get; set; }
33-
3432
[Required]
3533
public bool EnableCompression { get; set; }
3634

@@ -58,10 +56,6 @@ public class CollectAssemblyFilesForArchive : AndroidTask
5856

5957
public override bool RunTask ()
6058
{
61-
// If we aren't embedding assemblies, we don't need to do anything
62-
if (!EmbedAssemblies)
63-
return !Log.HasLoggedErrors;
64-
6559
var files = new PackageFileListBuilder ();
6660

6761
DSOWrapperGenerator.Config dsoWrapperConfig = DSOWrapperGenerator.GetConfig (Log, AndroidBinUtilsDirectory, IntermediateOutputPath);

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2117,7 +2117,6 @@ because xbuild doesn't support framework reference assemblies.
21172117
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
21182118
ApkOutputPath="$(_ApkOutputPath)"
21192119
AppSharedLibrariesDir="$(_AndroidApplicationSharedLibraryPath)"
2120-
EmbedAssemblies="$(EmbedAssembliesIntoApk)"
21212120
EnableCompression="$(AndroidEnableAssemblyCompression)"
21222121
IncludeDebugSymbols="$(AndroidIncludeDebugSymbols)"
21232122
IntermediateOutputPath="$(IntermediateOutputPath)"
@@ -2247,21 +2246,6 @@ because xbuild doesn't support framework reference assemblies.
22472246
LibraryProjectJars="@(ExtractedJarImports)">
22482247
<Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
22492248
</CollectJarContentFilesForArchive>
2250-
2251-
<CollectAssemblyFilesForArchive
2252-
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
2253-
ApkOutputPath="$(_ApkOutputPath)"
2254-
AppSharedLibrariesDir="$(_AndroidApplicationSharedLibraryPath)"
2255-
EmbedAssemblies="$(EmbedAssembliesIntoApk)"
2256-
EnableCompression="$(AndroidEnableAssemblyCompression)"
2257-
IncludeDebugSymbols="$(AndroidIncludeDebugSymbols)"
2258-
IntermediateOutputPath="$(IntermediateOutputPath)"
2259-
ProjectFullPath="$(MSBuildProjectFullPath)"
2260-
ResolvedFrameworkAssemblies="@(_ShrunkFrameworkAssemblies)"
2261-
ResolvedUserAssemblies="@(_ResolvedUserAssemblies);@(_AndroidResolvedSatellitePaths)"
2262-
SupportedAbis="@(_BuildTargetAbis)">
2263-
<Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
2264-
</CollectAssemblyFilesForArchive>
22652249

22662250
<CollectRuntimeConfigFilesForArchive
22672251
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"

0 commit comments

Comments
 (0)