-
Notifications
You must be signed in to change notification settings - Fork 538
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Helpful reading: * https://github.com/dotnet/runtime/blob/15dec9a2aa5a4236d6ba70de2e9c146867b9d2e0/src/tasks/AotCompilerTask/MonoAOTCompiler.cs * https://github.com/dotnet/runtime/blob/15dec9a2aa5a4236d6ba70de2e9c146867b9d2e0/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/README.md To make this work, I moved the existing `<Aot/>` MSBuild task calls to a new `_AndroidAot` MSBuild target in `Xamarin.Android.Legacy.targets`. In the .NET 6 targets, there is a *different* `_AndroidAot` MSBuild target that runs the new `<MonoAOTCompiler/>` MSBuild task. The `_AndroidAot` target runs per `$(RuntimeIdentifier)` after the linker completes. Native libraries are added to the `@(ResolvedFileToPublish)` item group to be included in the final `.apk`. To follow convention with Blazor WASM: https://devblogs.microsoft.com/aspnet/asp-net-core-updates-in-net-6-preview-4/#blazor-webassembly-ahead-of-time-aot-compilation The `$(RunAOTCompilation)` MSBuild property enables AOT. To help with backwards compatibility with "legacy" Xamarin.Android, I kept the `$(AotAssemblies)` MSBuild property intact.
- Loading branch information
1 parent
b529d52
commit 064301b
Showing
12 changed files
with
459 additions
and
274 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
...marin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Aot.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
<!-- | ||
*********************************************************************************************** | ||
Microsoft.Android.Sdk.Aot.targets | ||
.NET 6 AOT support. You can find "legacy" Xamarin.Android AOT support | ||
in Xamarin.Android.Legacy.targets. | ||
For <MonoAOTCompiler/> usage, see: | ||
* https://github.com/dotnet/runtime/blob/15dec9a2aa5a4236d6ba70de2e9c146867b9d2e0/src/tasks/AotCompilerTask/MonoAOTCompiler.cs | ||
* https://github.com/dotnet/runtime/blob/15dec9a2aa5a4236d6ba70de2e9c146867b9d2e0/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/README.md | ||
These targets are running within the _ComputeFilesToPublishForRuntimeIdentifiers target. | ||
They run in a context of an inner build with a single $(RuntimeIdentifier). | ||
*********************************************************************************************** | ||
--> | ||
<Project> | ||
|
||
<UsingTask TaskName="Xamarin.Android.Tasks.GetAotArguments" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" /> | ||
|
||
<Target Name="_AndroidAotInputs"> | ||
<ItemGroup> | ||
<_AndroidAotInputs Include="@(ResolvedFileToPublish)" Condition=" '%(Extension)' == '.dll' " /> | ||
</ItemGroup> | ||
</Target> | ||
|
||
<Target Name="_AndroidAot" | ||
Condition=" '$(AotAssemblies)' == 'true' and '$(RuntimeIdentifier)' != '' " | ||
DependsOnTargets="_AndroidAotInputs" | ||
Inputs="@(_AndroidAotInputs)" | ||
Outputs="$(_AndroidStampDirectory)_AndroidAot.stamp"> | ||
<GetAotArguments | ||
AndroidAotMode="$(AndroidAotMode)" | ||
AndroidNdkDirectory="$(_AndroidNdkDirectory)" | ||
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)" | ||
AndroidApiLevel="$(_AndroidApiLevel)" | ||
ManifestFile="$(_OuterIntermediateOutputPath)android\AndroidManifest.xml" | ||
AndroidSequencePointsMode="$(_SequencePointsMode)" | ||
AotAdditionalArguments="$(AndroidAotAdditionalArguments)" | ||
AotOutputDirectory="$(_AndroidAotBinDirectory)" | ||
RuntimeIdentifier="$(RuntimeIdentifier)" | ||
EnableLLVM="$(EnableLLVM)" | ||
Profiles="@(_AotProfiles)"> | ||
<Output PropertyName="_AotArguments" TaskParameter="Arguments" /> | ||
</GetAotArguments> | ||
<ItemGroup> | ||
<_MonoAOTAssemblies Include="@(_AndroidAotInputs->'%(FullPath)')" AotArguments="$(_AotArguments)" /> | ||
</ItemGroup> | ||
<MakeDir Directories="$(IntermediateOutputPath)aot\" /> | ||
<MonoAOTCompiler | ||
Assemblies="@(_MonoAOTAssemblies)" | ||
CompilerBinaryPath="@(MonoAotCrossCompiler->WithMetadataValue('RuntimeIdentifier', '$(RuntimeIdentifier)'))" | ||
DisableParallelAot="$(_DisableParallelAot)" | ||
LibraryFormat="So" | ||
LLVMPath="$(_LLVMPath)" | ||
Mode="$(AndroidAotMode)" | ||
OutputDir="$(IntermediateOutputPath)aot\" | ||
OutputType="Library" | ||
UseAotDataFile="false" | ||
UseLLVM="$(EnableLLVM)"> | ||
<Output TaskParameter="CompiledAssemblies" ItemName="_AotCompiledAssemblies" /> | ||
<Output TaskParameter="FileWrites" ItemName="FileWrites" /> | ||
</MonoAOTCompiler> | ||
<Touch Files="$(_AndroidStampDirectory)_AndroidAot.stamp" AlwaysCreate="true" /> | ||
<ItemGroup> | ||
<ResolvedFileToPublish | ||
Include="@(_AotCompiledAssemblies->'%(LibraryFile)')" | ||
ArchiveFileName="libaot-$([System.IO.Path]::GetFileName('%(_AotCompiledAssemblies.LibraryFile)'))" | ||
/> | ||
</ItemGroup> | ||
</Target> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.