From 597d831cbbcc216ad2bf5f9ac93586df6ae1403e Mon Sep 17 00:00:00 2001
From: Jo Shields <directhex@apebox.org>
Date: Mon, 3 Jul 2023 15:03:57 -0400
Subject: [PATCH] Don't block Android builds from configuring/using a cross
 compiler

---
 eng/native/build-commons.sh | 2 +-
 src/mono/mono.proj          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh
index e9d696fa87f14a..f8923abb391061 100755
--- a/eng/native/build-commons.sh
+++ b/eng/native/build-commons.sh
@@ -78,7 +78,7 @@ build_native()
         cmakeArgs="-DCMAKE_SYSTEM_VARIANT=maccatalyst $cmakeArgs"
     fi
 
-    if [[ ( "$targetOS" == android || "$targetOS" == linux-bionic ) && -z "$ROOTFS_DIR" ]]; then
+    if [[ ( "$targetOS" == android || "$targetOS" == linux-bionic )]]; then
         if [[ -z "$ANDROID_NDK_ROOT" ]]; then
             echo "Error: You need to set the ANDROID_NDK_ROOT environment variable pointing to the Android NDK root."
             exit 1
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index 7cfff98ac8eb37..13984124c72596 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -772,7 +772,7 @@
 
     <!-- Android specific options -->
     <PropertyGroup Condition="'$(TargetsAndroid)' == 'true' or '$(TargetsLinuxBionic)' == 'true'">
-      <_MonoSkipInitCompiler>true</_MonoSkipInitCompiler>
+      <_MonoSkipInitCompiler>false</_MonoSkipInitCompiler>
 
       <MonoUseCrossTool>true</MonoUseCrossTool>
       <MonoAotCMakeSysroot Condition="Exists('$(ANDROID_NDK_ROOT)/sysroot')">$(ANDROID_NDK_ROOT)/sysroot</MonoAotCMakeSysroot>