From 64286d478d0f499d1cf383a31cfd39ac64788f5b Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Tue, 14 Jan 2025 14:20:21 -0500 Subject: [PATCH] Since we bumped the NDK in https://github.com/dotnet/dotnet-buildtools-prereqs-docker/pull/1278, libClang.so is no longer found in the place we expect. As a result, the android aot offsets won't be generated and the dedicated CI leg will fail. This change fixes the path. --- src/mono/mono.proj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index a643e5a049e79c..d0e704abbdf5a7 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -688,7 +688,9 @@ - <_LibClang Include="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib64/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)' == '' "/> + <_LibClang Include="/usr/local/lib/libclang.so" Condition="'@(_LibClang)' == ''" /> true