diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 841c1f3c5db..41c831472ab 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -699,13 +699,11 @@ stages: - template: yaml-templates/apk-instrumentation.yaml parameters: - # TODO: disable LLVM test, see: https://github.com/dotnet/runtime/issues/68914 - condition: false configuration: $(XA.Build.Configuration) testName: Mono.Android.NET_Tests-AotLlvm project: tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)AotLlvm.xml - extraBuildArgs: -p:TestsFlavor=AotLlvm -p:EnableLlvm=true + extraBuildArgs: -p:TestsFlavor=AotLlvm -p:EnableLlvm=true -p:AndroidEnableProfiledAot=false artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab artifactFolder: $(DotNetTargetFramework)-AotLlvm useDotNet: true diff --git a/src/Mono.Android/Android.App/Application.cs b/src/Mono.Android/Android.App/Application.cs index e7fca8d2190..eea614a5236 100644 --- a/src/Mono.Android/Android.App/Application.cs +++ b/src/Mono.Android/Android.App/Application.cs @@ -7,6 +7,8 @@ namespace Android.App { partial class Application { + // NOTE: an explicit .cctor solves startup ordering with JNIEnv.Initialize() + static Application () { } static Context? _context; public static Context Context {