Skip to content

Commit 93cc258

Browse files
committed
Don't link static libc++, it causes duplicate symbol errors with libstdc++-compat
1 parent 3951399 commit 93cc258

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.NativeAOT.targets

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,15 @@ This file contains the NativeAOT-specific MSBuild logic for .NET for Android.
107107
<!-- Passes linked assemblies to outer MSBuild tasks/targets -->
108108
<ResolvedFileToPublish Include="@(IlcCompileInput);@(_AndroidILLinkAssemblies)" RuntimeIdentifier="$(RuntimeIdentifier)" />
109109
<!-- Include libc++ -->
110-
<ResolvedFileToPublish Include="$(_NdkSysrootDir)libc++_static.a" RuntimeIdentifier="$(RuntimeIdentifier)" />
110+
<ResolvedFileToPublish Include="$(_NdkSysrootDir)libc++_shared.so" RuntimeIdentifier="$(RuntimeIdentifier)" />
111111
<!-- Satellite assemblies -->
112112
<IlcSatelliteAssembly Include="$(_OuterIntermediateSatelliteAssembliesWithTargetPath)" />
113113

114114
<LinkerArg Include="@(RuntimePackAsset->WithMetadataValue('Filename', 'libnaot-android.$(Configuration.ToLower())-static-$(Configuration.ToLower())'))" />
115-
<LinkerArg Include="$(_NdkSysrootDir)libc++_static.a" />
115+
<!-- <LinkerArg Include="$(_NdkSysrootDir)libc++_static.a" /> -->
116+
117+
<!-- Every p/invoke using the `xa-internal-api` "library" will be called directly -->
118+
<DirectPInvoke Include="xa-internal-api" />
116119
</ItemGroup>
117120
</Target>
118121

0 commit comments

Comments
 (0)