Skip to content

[Mono] Skip satellite assemblies during Java type generation #12488

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

Closed
Copilot wants to merge 4 commits into from
Closed

[Mono] Skip satellite assemblies during Java type generation #12488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61cd544
Initial plan
Copilot Aug 24, 2026
faa0a73
Skip satellite assemblies during JLO scanning
Copilot Aug 24, 2026
6a8c979
Clarify satellite assembly convention
Copilot Aug 24, 2026
4bd2373
Fix satellite regression test injection
Copilot Aug 25, 2026
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
10 changes: 7 additions & 3 deletions ...id.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.LlvmIr.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,24 @@
</PropertyGroup>
<ItemGroup>
<_MergedManifestDocuments Condition=" '$(AndroidManifestMerger)' == 'legacy' " Include="@(ExtractedManifestDocuments)" />
<!-- By .NET convention, *.resources.dll files are satellite assemblies; they contain no types or scanner sidecars. -->
<_AndroidResolvedAssembliesToScan
Include="@(_ResolvedAssemblies)"
Condition=" !$([System.String]::Copy('%(_ResolvedAssemblies.Filename)').ToLowerInvariant().EndsWith('.resources')) " />
</ItemGroup>

<GenerateJavaCallableWrappers
CodeGenerationTarget="$(_AndroidJcwCodegenTarget)"
OutputDirectory="$(IntermediateOutputPath)android\src"
ResolvedAssemblies="@(_ResolvedAssemblies)"
ResolvedAssemblies="@(_AndroidResolvedAssembliesToScan)"
PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
SupportedAbis="@(_BuildTargetAbis)">
<Output TaskParameter="GeneratedJavaFilesOutput" ItemName="_GeneratedJavaFiles" />
</GenerateJavaCallableWrappers>

<GenerateACWMap
AcwMapFile="$(_AcwMapFile)"
ResolvedAssemblies="@(_ResolvedAssemblies)"
ResolvedAssemblies="@(_AndroidResolvedAssembliesToScan)"
SupportedAbis="@(_BuildTargetAbis)">
</GenerateACWMap>

Expand Down Expand Up @@ -95,7 +99,7 @@
EmitLlvmIrComments="$(_AndroidEmitLlvmIrComments)"
EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
IntermediateOutputDirectory="$(IntermediateOutputPath)"
ResolvedAssemblies="@(_ResolvedAssemblies)"
ResolvedAssemblies="@(_AndroidResolvedAssembliesToScan)"
SkipJniAddNativeMethodRegistrationAttributeScan="$(_SkipJniAddNativeMethodRegistrationAttributeScan)"
SupportedAbis="@(_BuildTargetAbis)"
TypemapImplementation="$(AndroidTypeMapImplementation)"
Expand Down
47 changes: 43 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,27 +93,62 @@ public void CheckDebugModeWithTrimming ([Values (AndroidRuntime.CoreCLR)] Androi
string.Join (Environment.NewLine, missingFiles)));
}

[Test]
[NonParallelizable] // Commonly fails NuGet restore
public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblyStores, [Values (AndroidRuntime.CoreCLR)] AndroidRuntime runtime)
[TestCase (false, AndroidRuntime.CoreCLR)]
[TestCase (true, AndroidRuntime.CoreCLR)]
[TestCase (true, AndroidRuntime.MonoVM)]
public void CheckIncludedAssemblies (bool usesAssemblyStores, AndroidRuntime runtime)
{
if (!usesAssemblyStores && runtime == AndroidRuntime.CoreCLR) {
Assert.Ignore ("CoreCLR only supports builds with assembly stores.");
return;
}

var injectPackagedSatellite = new Import (() => "InjectPackagedSatellite.targets") {
TextContent = () =>
"""
<Project>
<Target Name="_AndroidInjectPackagedSatellite"
AfterTargets="_PrepareAssemblies"
Condition=" '$(UseMonoRuntime)' == 'true' ">
<ItemGroup>
<_ResolvedAssemblies Include="@(ReferenceSatellitePaths)">
<_InjectedPackagedSatellite>true</_InjectedPackagedSatellite>
</_ResolvedAssemblies>
</ItemGroup>
<Message
Condition=" '%(_ResolvedAssemblies._InjectedPackagedSatellite)' == 'true' "
Importance="high"
Text="InjectedPackagedSatellite=%(_ResolvedAssemblies.Identity)" />
</Target>
<Target Name="_AndroidRemoveInjectedPackagedSatellite"
AfterTargets="_GenerateJavaStubs"
Condition=" '$(UseMonoRuntime)' == 'true' ">
<ItemGroup>
<_ResolvedAssemblies
Remove="@(_ResolvedAssemblies)"
Condition=" '%(_ResolvedAssemblies._InjectedPackagedSatellite)' == 'true' " />
</ItemGroup>
</Target>
</Project>
"""
};
var proj = new XamarinAndroidApplicationProject {
IsRelease = true
IsRelease = true,
Imports = { injectPackagedSatellite },
};

AndroidTargetArch[] supportedArches = new[] {
runtime switch {
AndroidRuntime.MonoVM => AndroidTargetArch.Arm,
AndroidRuntime.MonoVM => AndroidTargetArch.Arm64,
AndroidRuntime.CoreCLR => AndroidTargetArch.Arm64,
_ => throw new NotSupportedException ($"Unsupported runtime '{runtime}'")
}
};
proj.SetRuntime (runtime);
if (runtime == AndroidRuntime.MonoVM) {
proj.SetProperty ("_DisableCheckForUnsupportedMonoMobileRuntime", "true");
}
proj.SetProperty ("AndroidUseAssemblyStore", usesAssemblyStores.ToString ());
proj.SetRuntimeIdentifiers (supportedArches);
proj.PackageReferences.Add (new Package {
Expand Down Expand Up @@ -157,6 +192,10 @@ public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblySto

using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "build should have succeeded.");
if (runtime == AndroidRuntime.MonoVM) {
Assert.IsTrue (b.LastBuildOutput.Any (line => line.Contains ("InjectedPackagedSatellite=", StringComparison.Ordinal)),
"The test should expose a packaged satellite assembly to Java stub generation.");
}
var apk = Path.Combine (Root, b.ProjectDirectory,
proj.OutputPath, $"{proj.PackageName}-Signed.apk");
var helper = new ArchiveAssemblyHelper (apk, usesAssemblyStores);
Expand Down
Loading