From fa20a0d92836a5d2b362a4be795c4294728a3f1a Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Mon, 10 Jun 2024 17:52:15 +0200
Subject: [PATCH 1/2] [android] Fix build withe newer NDK

Newer versions of Android NDK (tested with 26.3) no longer include
support for 32-bit host machines and have moved libraries around for
that reason.  One of the libraries that changed its location is
`libclang.so`, required to build MonoVM for Android.

This PR adds support to detect the library at its new location.
---
 src/mono/mono.proj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index 8f02901b6d771..aade4f0fbe419 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -806,7 +806,8 @@ JS_ENGINES = [NODE_JS]
 
     <!-- Linux specific options -->
     <ItemGroup Condition="'$(AotHostOS)' == 'linux'">
-      <_LibClang Include="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib64/libclang.so.*"/>
+      <_LibClang Include="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib/libclang.so" />
+      <_LibClang Include="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib64/libclang.so.*" Condition=" '$(_LibClang)' == '' "/>
     </ItemGroup>
     <PropertyGroup Condition="'$(TargetsLinux)' == 'true' and '$(Platform)' == 'arm64'">
       <MonoUseCrossTool>true</MonoUseCrossTool>

From 590877b319b5d75bd89d02cc6d0bc603f4fada33 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Tue, 11 Jun 2024 10:51:40 +0200
Subject: [PATCH 2/2] better

---
 src/mono/mono.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index aade4f0fbe419..14056eb3a7e24 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -806,7 +806,7 @@ JS_ENGINES = [NODE_JS]
 
     <!-- Linux specific options -->
     <ItemGroup Condition="'$(AotHostOS)' == 'linux'">
-      <_LibClang Include="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib/libclang.so" />
+      <_LibClang Include="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib/libclang.so" Condition=" Exists('$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib/libclang.so') "/>
       <_LibClang Include="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib64/libclang.so.*" Condition=" '$(_LibClang)' == '' "/>
     </ItemGroup>
     <PropertyGroup Condition="'$(TargetsLinux)' == 'true' and '$(Platform)' == 'arm64'">