Skip to content

Remove call to CollectAssemblyFilesForArchive for Fast Deployment. #9650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 1 commit into from
Jan 8, 2025
Merged

Remove call to CollectAssemblyFilesForArchive for Fast Deployment. #9650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/Xamarin.Android.Build.Tasks/Tasks/CollectAssemblyFilesForArchive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ public class CollectAssemblyFilesForArchive : AndroidTask
[Required]
public string AppSharedLibrariesDir { get; set; } = "";

public bool EmbedAssemblies { get; set; }

[Required]
public bool EnableCompression { get; set; }

Expand Down Expand Up @@ -58,10 +56,6 @@ public class CollectAssemblyFilesForArchive : AndroidTask

public override bool RunTask ()
{
// If we aren't embedding assemblies, we don't need to do anything
if (!EmbedAssemblies)
return !Log.HasLoggedErrors;

var files = new PackageFileListBuilder ();

DSOWrapperGenerator.Config dsoWrapperConfig = DSOWrapperGenerator.GetConfig (Log, AndroidBinUtilsDirectory, IntermediateOutputPath);
Expand Down
16 changes: 0 additions & 16 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2117,7 +2117,6 @@ because xbuild doesn't support framework reference assemblies.
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
ApkOutputPath="$(_ApkOutputPath)"
AppSharedLibrariesDir="$(_AndroidApplicationSharedLibraryPath)"
EmbedAssemblies="$(EmbedAssembliesIntoApk)"
EnableCompression="$(AndroidEnableAssemblyCompression)"
IncludeDebugSymbols="$(AndroidIncludeDebugSymbols)"
IntermediateOutputPath="$(IntermediateOutputPath)"
Expand Down Expand Up @@ -2247,21 +2246,6 @@ because xbuild doesn't support framework reference assemblies.
LibraryProjectJars="@(ExtractedJarImports)">
<Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
</CollectJarContentFilesForArchive>

<CollectAssemblyFilesForArchive
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
ApkOutputPath="$(_ApkOutputPath)"
AppSharedLibrariesDir="$(_AndroidApplicationSharedLibraryPath)"
EmbedAssemblies="$(EmbedAssembliesIntoApk)"
EnableCompression="$(AndroidEnableAssemblyCompression)"
IncludeDebugSymbols="$(AndroidIncludeDebugSymbols)"
IntermediateOutputPath="$(IntermediateOutputPath)"
ProjectFullPath="$(MSBuildProjectFullPath)"
ResolvedFrameworkAssemblies="@(_ShrunkFrameworkAssemblies)"
ResolvedUserAssemblies="@(_ResolvedUserAssemblies);@(_AndroidResolvedSatellitePaths)"
SupportedAbis="@(_BuildTargetAbis)">
<Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
</CollectAssemblyFilesForArchive>

<CollectRuntimeConfigFilesForArchive
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
Expand Down
Loading