From 91f4f4ed55999e01bff787e02b6719adc95bdaa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Sun, 28 Mar 2021 13:53:12 +0200
Subject: [PATCH 1/2] Reenable Android.Device_Emulator.Aot.Test.csproj

Closes https://github.com/dotnet/runtime/issues/49757
---
 src/libraries/tests.proj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 55fdbc13f9f1fb..aa549490c3736f 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -352,9 +352,7 @@
   <ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'Android'">
     <ProjectReference Include="$(MonoProjectRoot)sample\Android\AndroidSampleApp.csproj"
                       BuildInParallel="false" />
-    <!-- Disable Android.Device_Emulator.Aot.Test.csproj temporarily due to https://github.com/dotnet/runtime/issues/49757 -->
     <ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\Android\**\*.Test.csproj"
-                      Exclude="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\AOT\Android.Device_Emulator.Aot.Test.csproj"
                       BuildInParallel="false" />
   </ItemGroup>
   

From 50fc94507a75ffde88fa8f9653b7eae5c3b745af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Wed, 31 Mar 2021 18:13:52 +0200
Subject: [PATCH 2/2] Update tests.proj

---
 src/libraries/tests.proj | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index aa549490c3736f..fdc39622b3e1c8 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -68,6 +68,11 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\System.Text.RegularExpressions.Tests.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetOS)' == 'Android' and '$(TargetArchitecture)' == 'x86'">
+    <!-- https://github.com/dotnet/runtime/issues/50493 -->
+    <FunctionalTestExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\AOT\Android.Device_Emulator.Aot.Test.csproj" />
+  </ItemGroup>
+
   <ItemGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator') and '$(RunDisablediOSTests)' != 'true'">
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.Composite\tests\Microsoft.Extensions.FileProviders.Composite.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.HostFactoryResolver\tests\Microsoft.Extensions.HostFactoryResolver.Tests.csproj" />
@@ -341,11 +346,13 @@
     <ProjectReference Include="$(MonoProjectRoot)sample\iOS\Program.csproj"
                       BuildInParallel="false" />
     <ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\**\*.Test.csproj"
+                      Exclude="@(FunctionalTestExclusions)"
                       BuildInParallel="false" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(ArchiveTests)' == 'true' and ('$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator')">
     <ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\tvOS\**\*.Test.csproj"
+                      Exclude="@(FunctionalTestExclusions)"
                       BuildInParallel="false" />
   </ItemGroup>
   
@@ -353,6 +360,7 @@
     <ProjectReference Include="$(MonoProjectRoot)sample\Android\AndroidSampleApp.csproj"
                       BuildInParallel="false" />
     <ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\Android\**\*.Test.csproj"
+                      Exclude="@(FunctionalTestExclusions)"
                       BuildInParallel="false" />
   </ItemGroup>
   
@@ -360,6 +368,7 @@
     <ProjectReference Include="$(MonoProjectRoot)sample\wasm\**\*.Sample.csproj"
                       BuildInParallel="false" />
     <ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\WebAssembly\**\*.Test.csproj"
+                      Exclude="@(FunctionalTestExclusions)"
                       BuildInParallel="false" />
   </ItemGroup>