Skip to content
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

[Xamarin.Build.Download] remove AndroidAarFixups #1368

Merged
merged 1 commit into from
May 5, 2022
Merged

[Xamarin.Build.Download] remove AndroidAarFixups #1368

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
124 changes: 0 additions & 124 deletions Util/Xamarin.Build.Download/source/Xamarin.Build.Download/AndroidAarFixups.cs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<_XamarinBuildDownloadIsAndroid>true</_XamarinBuildDownloadIsAndroid>
<_XamarinBuildDownloadMasterBeforeTargets>_ResolveLibraryProjectImports</_XamarinBuildDownloadMasterBeforeTargets>
<_XamarinBuildDownloadMasterDependsOnTargets>ResolveAssemblyReferences;_XamarinBuildDownload;_XamarinBuildDownloadAarRestore;_XamarinBuildDownloadAarInclude</_XamarinBuildDownloadMasterDependsOnTargets>
<_XamarinBuildDownloadAndroidFixManifests Condition="'$(_XamarinBuildDownloadAndroidFixManifests)' == ''">true</_XamarinBuildDownloadAndroidFixManifests>
</PropertyGroup>

<PropertyGroup Condition="'$(_XamarinBuildDownloadIsAndroid)'==''">
Expand Down Expand Up @@ -58,7 +57,6 @@
User7ZipPath="$(XamarinBuildDownloadUser7ZipPath)"
VsInstallRoot="$(VsInstallRoot)"
IsAndroid="$(_XamarinBuildDownloadIsAndroid)"
AndroidFixManifests="$(_XamarinBuildDownloadAndroidFixManifests)"
/>
</Target>

Expand All @@ -69,7 +67,6 @@
Parts="@(XamarinBuildDownloadPartialZip)"
CacheDirectory="$(XamarinBuildDownloadDir)"
IsAndroid="$(_XamarinBuildDownloadIsAndroid)"
AndroidFixManifests="$(_XamarinBuildDownloadAndroidFixManifests)"
/>
</Target>

Expand Down
6 changes: 0 additions & 6 deletions Util/Xamarin.Build.Download/source/Xamarin.Build.Download/XamarinDownloadArchives.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ public class XamarinDownloadArchives : AsyncTask, ILogger

public bool IsAndroid { get; set; }

public bool AndroidFixManifests { get; set; }

DownloadUtils downloadUtils;

public override bool Execute ()
Expand Down Expand Up @@ -171,10 +169,6 @@ async Task<bool> MakeSureLibraryIsInPlace (XamarinBuildDownload xbd, Cancellatio
LogMessage (" Downloading {0} to {1}", xbd.Url, xbd.CacheFile);
client.DownloadFileTaskAsync (xbd.Url, xbd.CacheFile).Wait (token);

// Run through our AAR fixups if it's android
if (IsAndroid)
AndroidAarFixups.FixupAar(xbd.CacheFile, AndroidFixManifests, Log);

LogMessage (" Downloading Complete");
client.DownloadProgressChanged -= downloadHandler;
}
Expand Down
6 changes: 0 additions & 6 deletions Util/Xamarin.Build.Download/source/Xamarin.Build.Download/XamarinDownloadPartialZips.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ public class XamarinDownloadPartialZips : AsyncTask, ILogger

public bool IsAndroid { get; set; }

public bool AndroidFixManifests { get; set; }

HttpClient http;

public override bool Execute ()
Expand Down Expand Up @@ -178,10 +176,6 @@ async Task<bool> ExtractPartAndValidate (PartialZipDownload part, Stream partInp
return false;
}

// Run through our AAR fixups if it's android
if (IsAndroid)
AndroidAarFixups.FixupAar(outputPath, AndroidFixManifests, Log);

return true;
}

Expand Down