Skip to content

Commit 9e29014

Browse files
committed
[release/9.0] Change were libClang.so is found when generating Android aot offsets
Since we bumped the NDK in dotnet/dotnet-buildtools-prereqs-docker#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.
1 parent 1975912 commit 9e29014

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/mono/mono.proj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,8 +817,7 @@ JS_ENGINES = [NODE_JS]
817817

818818
<!-- Linux specific options -->
819819
<ItemGroup Condition="'$(AotHostOS)' == 'linux'">
820-
<_LibClang Include="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib/libclang.so" Condition=" Exists('$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib/libclang.so') "/>
821-
<_LibClang Include="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib64/libclang.so.*" Condition=" '$(_LibClang)' == '' "/>
820+
<_LibClang Include="/usr/local/lib/libclang.so" />
822821
</ItemGroup>
823822
<PropertyGroup Condition="'$(TargetsLinux)' == 'true' and '$(Platform)' == 'arm64'">
824823
<MonoUseCrossTool>true</MonoUseCrossTool>

0 commit comments

Comments
 (0)