[One .NET] don't pass satellite assemblies to the AOT compiler #6687
Conversation
This file contains hidden or 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
dellis1972
approved these changes
Jan 30, 2022
Fixes: dotnet/runtime#64269 An F# test was failing in AOT builds with: Microsoft.Android.Sdk.Aot.targets(74,5): Precompiling failed for C:\src\xamarin-android\bin\TestDebug\temp\BuildBasicApplicationFSharpTrue\obj\Release\android-arm\aot-in\FSharp.Core.resources.dll. AOT of image obj\Release\android-arm\aot-in\FSharp.Core.resources.dll failed. Mono Ahead of Time compiler - compiling assembly C:\src\xamarin-android\bin\TestDebug\temp\BuildBasicApplicationFSharpTrue\obj\Release\android-arm\aot-in\FSharp.Core.resources.dll AOTID 302CA46D-4000-DCAD-1A9F-642D849470DE Using profile data file 'C:\Program Files\dotnet\dotnet\packs\Microsoft.Android.Sdk.Windows\31.0.200-ci.dotnet-release-aot-by-default.36\targets\dotnet.aotprofile' Added 0 methods from profile. Compiled: 0/0 Executing the native assembler: "C:\Program Files\dotnet\dotnet\packs\Microsoft.Android.Sdk.Windows\31.0.200-ci.dotnet-release-aot-by-default.36\tools\binutils\arm-linux-androideabi-as" -mfpu=vfp3 -o obj\Release\android-arm\aot\armeabi-v7a\FSharp.Core.resources\temp.s.o obj\Release\android-arm\aot\armeabi-v7a\FSharp.Core.resources\temp.s Executing the native linker: "C:\Program Files\dotnet\dotnet\packs\Microsoft.Android.Sdk.Windows\31.0.200-ci.dotnet-release-aot-by-default.36\tools\binutils\arm-linux-androideabi-ld" -Bsymbolic -shared -o obj\Release\android-arm\aot\FSharp.Core.resources.dll.so.tmp obj\Release\android-arm\aot\armeabi-v7a\FSharp.Core.resources\temp.s.o Stripping the binary: "C:\Program Files\dotnet\dotnet\packs\Microsoft.Android.Sdk.Windows\31.0.200-ci.dotnet-release-aot-by-default.36\tools\binutils\arm-linux-androideabi-strip" --strip-symbol=\$a --strip-symbol=\$d obj\Release\android-arm\aot\FSharp.Core.resources.dll.so.tmp [C:\src\xamarin-android\bin\TestDebug\temp\BuildBasicApplicationFSharpTrue\UnnamedProject.fsproj] It turns out we shouldn't be passing satellite assemblies to the AOT compiler, they appear to be included in `@(ResolvedFileToPublish)`: <ItemGroup> <_AndroidAotInputs Include="@(ResolvedFileToPublish)" Condition=" '%(Extension)' == '.dll' " /> </ItemGroup> Viewing these assemblies, I see the metadata `%(ResolvedFileToPublish.AssetType)` is equal to `resources`. I think we can simply check for this and ignore these files. The F# test I parameterized to include an AOT build. I also removed a `TODO` on F# tests, since this is fixed now: dotnet/linker#1448
jonathanpeppers
force-pushed
the
aot-satellite-assemblies
branch
from
2bada93 to
06c144b
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: dotnet/runtime#64269
An F# test was failing in AOT builds with:
It turns out we shouldn't be passing satellite assemblies to the AOT
compiler, they appear to be included in
@(ResolvedFileToPublish):Viewing these assemblies, I see the metadata
%(ResolvedFileToPublish.AssetType)is equal toresources. I thinkwe can simply check for this and ignore these files.
The F# test I parameterized to include an AOT build.
I also removed a
TODOon F# tests, since this is fixed now:dotnet/linker#1448