Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection.PortableExecutable;
using Java.Interop.Tools.Cecil;
using Mono.Cecil;
using Mono.Linker;
using Mono.Linker.Steps;
using Mono.Tuner;
using Xamarin.Android.Tools;
using Xamarin.Android.Tasks;
using Resources = Xamarin.Android.Tasks.Properties.Resources;

Expand Down Expand Up @@ -46,6 +49,9 @@ public void ProcessAssembly (AssemblyDefinition assembly, StepContext context)
if (context.IsMainAssembly || !context.IsAndroidUserAssembly)
return;

if (IsReadyToRunAssembly (assembly))
return;

context.IsAssemblyModified |= FixAbstractMethods (assembly);
}

Expand All @@ -60,6 +66,7 @@ internal bool FixAbstractMethods (AssemblyDefinition assembly)
}

readonly HashSet<string> warnedAssemblies = new (StringComparer.Ordinal);
readonly HashSet<string> warnedReadyToRunAssemblies = new (StringComparer.Ordinal);

internal void CheckAppDomainUsage (AssemblyDefinition assembly, Action<string> warn)
{
Expand All @@ -76,6 +83,37 @@ internal void CheckAppDomainUsage (AssemblyDefinition assembly, Action<string> w
}
}

bool IsReadyToRunAssembly (AssemblyDefinition assembly)
{
if (assembly?.MainModule == null)
return false;

string fileName = assembly.MainModule.FileName;
if (fileName.IsNullOrEmpty () || !File.Exists (fileName))
return false;

try {
using (var stream = File.OpenRead (fileName))
using (var pe = new PEReader (stream)) {
bool isReadyToRun = pe.PEHeaders.CorHeader?.ManagedNativeHeaderDirectory.Size > 0;
if (!isReadyToRun)
return false;

if (warnedReadyToRunAssemblies.Add (assembly.Name.Name)) {
LogMessage ($"Skipping FixAbstractMethodsStep for ReadyToRun assembly '{assembly.Name.Name}'.");
}

return true;
}
} catch (IOException) {
return false;
} catch (UnauthorizedAccessException) {
return false;
} catch (BadImageFormatException) {
return false;
}
}

bool MightNeedFix (TypeDefinition type)
{
return !type.IsAbstract && type.IsSubclassOf ("Java.Lang.Object", TypeCache);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2178,21 +2178,6 @@ public void CheckLintResourceFileReferencesAreFixed ([Values] AndroidRuntime run
// TODO: [TestCase (false, AndroidRuntime.NativeAOT)]
public void SimilarAndroidXAssemblyNames (bool publishTrimmed, AndroidRuntime runtime)
{
if (!publishTrimmed && runtime == AndroidRuntime.CoreCLR) {
// This currently fails with the following exception:
//
// error XALNS7015: System.NotSupportedException: Writing mixed-mode assemblies is not supported
// at Mono.Cecil.ModuleWriter.Write(ModuleDefinition module, Disposable`1 stream, WriterParameters parameters)
// at Mono.Cecil.ModuleWriter.WriteModule(ModuleDefinition module, Disposable`1 stream, WriterParameters parameters)
// at Mono.Cecil.ModuleDefinition.Write(String fileName, WriterParameters parameters)
// at Mono.Cecil.AssemblyDefinition.Write(String fileName, WriterParameters parameters)
// at Xamarin.Android.Tasks.SaveChangedAssemblyStep.ProcessAssembly(AssemblyDefinition assembly, StepContext context) in src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs:line 197
// at Xamarin.Android.Tasks.AssemblyPipeline.Run(AssemblyDefinition assembly, StepContext context) in src/Xamarin.Android.Build.Tasks/Utilities/AssemblyPipeline.cs:line 26
// at Xamarin.Android.Tasks.AssemblyModifierPipeline.RunPipeline(AssemblyPipeline pipeline, ITaskItem source, ITaskItem destination) in src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs:line 175
Assert.Ignore ("CoreCLR: fails because of a Mono.Cecil lack of support");
return;
}

bool aotAssemblies = runtime == AndroidRuntime.MonoVM && publishTrimmed;
var proj = new XamarinAndroidApplicationProject {
IsRelease = true,
Expand Down