Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit ccee49b

Browse files
[Xamarin.Build.Download] remove AndroidAarFixups (#1368)
Context: dotnet/runtime#68734 A breaking chang in in .NET 7 has uncovered an issue when using Xamarin.Build.Download: Renaming: AndroidManifest.xml to AndroidManifest.xml ... (_XamarinBuildDownloadCore target) -> /Users/runner/.nuget/packages/xamarin.build.download/0.11.0/buildTransitive/Xamarin.Build.Download.targets(52,3): error XBD001: Download failed. Please download https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/17.6.0/play-services-basement-17.6.0.aar to a file called /Users/runner/Library/Caches/XamarinBuildDownload/playservicesbasement-17.6.0.aar. /Users/runner/.nuget/packages/xamarin.build.download/0.11.0/buildTransitive/Xamarin.Build.Download.targets(52,3): error XBD001: Download failed. Please download https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/17.2.1/play-services-tasks-17.2.1.aar to a file called /Users/runner/Library/Caches/XamarinBuildDownload/playservicestasks-17.2.1.aar. /Users/runner/.nuget/packages/xamarin.build.download/0.11.0/buildTransitive/Xamarin.Build.Download.targets(52,3): error XBD001: Download failed. Please download https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-base/17.6.0/play-services-base-17.6.0.aar to a file called /Users/runner/Library/Caches/XamarinBuildDownload/playservicesbase-17.6.0.aar. /Users/runner/.nuget/packages/xamarin.build.download/0.11.0/buildTransitive/Xamarin.Build.Download.targets(52,3): error XBD001: Download failed. Please download https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-maps/17.0.1/play-services-maps-17.0.1.aar to a file called /Users/runner/Library/Caches/XamarinBuildDownload/playservicesmaps-17.0.1.aar. 1 Warning(s) 4 Error(s) The exception is somewhat swallowed here, the underlying error is something like: System.InvalidOperationException : An entry named 'AndroidManifest.xml' already exists in the archive. This class had various "fixups" to workaround issues in Xamarin.Android. Many of these issues have long since been fixed. 1. Removal of `aapt/AndroidManifest.xml`. Xamarin.Android has been handling this since ~Sept 2018: dotnet/android@f6c3288 2. Removal of `internal_impl-*.jar`. Xamarin.Android has been handling this since ~Feb 2018: dotnet/android@6a8ea2b 3. Replacement of `android:name=".SomeService"` as shorthand for `androidx.foo.SomeService` in the `androidx.foo` package. The use of `manifest-merger` solves this issue completely. This setting is the default for .NET 6, and has been the default for AndroidX since ~July 2020: dotnet/android-libraries@c6c0e50
1 parent 895182c commit ccee49b

File tree

4 files changed

+0
-139
lines changed

4 files changed

+0
-139
lines changed

Util/Xamarin.Build.Download/source/Xamarin.Build.Download/AndroidAarFixups.cs

Lines changed: 0 additions & 124 deletions
This file was deleted.

Util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.targets

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<_XamarinBuildDownloadIsAndroid>true</_XamarinBuildDownloadIsAndroid>
2121
<_XamarinBuildDownloadMasterBeforeTargets>_ResolveLibraryProjectImports</_XamarinBuildDownloadMasterBeforeTargets>
2222
<_XamarinBuildDownloadMasterDependsOnTargets>ResolveAssemblyReferences;_XamarinBuildDownload;_XamarinBuildDownloadAarRestore;_XamarinBuildDownloadAarInclude</_XamarinBuildDownloadMasterDependsOnTargets>
23-
<_XamarinBuildDownloadAndroidFixManifests Condition="'$(_XamarinBuildDownloadAndroidFixManifests)' == ''">true</_XamarinBuildDownloadAndroidFixManifests>
2423
</PropertyGroup>
2524

2625
<PropertyGroup Condition="'$(_XamarinBuildDownloadIsAndroid)'==''">
@@ -58,7 +57,6 @@
5857
User7ZipPath="$(XamarinBuildDownloadUser7ZipPath)"
5958
VsInstallRoot="$(VsInstallRoot)"
6059
IsAndroid="$(_XamarinBuildDownloadIsAndroid)"
61-
AndroidFixManifests="$(_XamarinBuildDownloadAndroidFixManifests)"
6260
/>
6361
</Target>
6462

@@ -69,7 +67,6 @@
6967
Parts="@(XamarinBuildDownloadPartialZip)"
7068
CacheDirectory="$(XamarinBuildDownloadDir)"
7169
IsAndroid="$(_XamarinBuildDownloadIsAndroid)"
72-
AndroidFixManifests="$(_XamarinBuildDownloadAndroidFixManifests)"
7370
/>
7471
</Target>
7572

Util/Xamarin.Build.Download/source/Xamarin.Build.Download/XamarinDownloadArchives.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ public class XamarinDownloadArchives : AsyncTask, ILogger
3232

3333
public bool IsAndroid { get; set; }
3434

35-
public bool AndroidFixManifests { get; set; }
36-
3735
DownloadUtils downloadUtils;
3836

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

174-
// Run through our AAR fixups if it's android
175-
if (IsAndroid)
176-
AndroidAarFixups.FixupAar(xbd.CacheFile, AndroidFixManifests, Log);
177-
178172
LogMessage (" Downloading Complete");
179173
client.DownloadProgressChanged -= downloadHandler;
180174
}

Util/Xamarin.Build.Download/source/Xamarin.Build.Download/XamarinDownloadPartialZips.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ public class XamarinDownloadPartialZips : AsyncTask, ILogger
2121

2222
public bool IsAndroid { get; set; }
2323

24-
public bool AndroidFixManifests { get; set; }
25-
2624
HttpClient http;
2725

2826
public override bool Execute ()
@@ -178,10 +176,6 @@ async Task<bool> ExtractPartAndValidate (PartialZipDownload part, Stream partInp
178176
return false;
179177
}
180178

181-
// Run through our AAR fixups if it's android
182-
if (IsAndroid)
183-
AndroidAarFixups.FixupAar(outputPath, AndroidFixManifests, Log);
184-
185179
return true;
186180
}
187181

0 commit comments

Comments
 (0)