Skip to content

[wasm] Add support for using custom native libraries #55797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
radical merged 6 commits into from
Jul 19, 2021
Merged

[wasm] Add support for using custom native libraries #55797

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d68b40b
[wasm] Add support for using custom native libraries
radical Jul 16, 2021
47a4d0b
Add license header for new source files
radical Jul 16, 2021
cfcaa6f
Use `@(NativeFileReference)` instead of `@(NativeReference)`
radical Jul 16, 2021
1adbf31
Add missing NativeLibraryTests.cs, and enable aot builds
radical Jul 16, 2021
7973d6f
Add missing NativeLib.o
radical Jul 16, 2021
0ea5099
PInvokeTableGenerator: handle native libs with hyphen in their name
radical Jul 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use @(NativeFileReference) instead of @(NativeReference)
  • Loading branch information
@radical
radical committed Jul 16, 2021
commit cfcaa6f705de725b51ffc4d8258c104d82db3ab5
11 changes: 3 additions & 8 deletions src/mono/wasm/build/WasmApp.Native.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@

<PropertyGroup>
<WasmBuildNative Condition="'$(RunAOTCompilation)' == 'true'">true</WasmBuildNative>
<WasmBuildNative Condition="'$(WasmBuildNative)' == '' and @(NativeReference->Count()) > 0" >true</WasmBuildNative>
<WasmBuildNative Condition="'$(WasmBuildNative)' == '' and @(NativeFileReference->Count()) > 0" >true</WasmBuildNative>
<WasmBuildNative Condition="'$(WasmBuildNative)' == '' and '$(PublishTrimmed)' != 'true'" >false</WasmBuildNative>
<WasmBuildNative Condition="'$(WasmBuildNative)' == '' and '$(Configuration)' == 'Release'" >true</WasmBuildNative>
<WasmBuildNative Condition="'$(WasmBuildNative)' == ''">false</WasmBuildNative>
Expand Down Expand Up @@ -191,10 +191,10 @@
<_WasmRuntimePackSrcFile ObjectFile="$(_WasmIntermediateOutputPath)%(FileName).o" />

<_DotnetJSSrcFile Include="$(_WasmRuntimePackSrcDir)\*.js" />
<_WasmNativeFileForLinking Include="@(NativeReference)" />
<_WasmNativeFileForLinking Include="@(NativeFileReference)" />
</ItemGroup>

<Error Text="Could not find NativeReference %(NativeReference.Identity)" Condition="'%(NativeReference.Identity)' != '' and !Exists(%(NativeReference.Identity))" />
<Error Text="Could not find NativeFileReference %(NativeFileReference.Identity)" Condition="'%(NativeFileReference.Identity)' != '' and !Exists(%(NativeFileReference.Identity))" />
</Target>

<Target Name="_GeneratePInvokeTable">
Expand Down Expand Up @@ -496,9 +496,4 @@ EMSCRIPTEN_KEEPALIVE void mono_wasm_load_profiler_aot (const char *desc) { mono_
<EmccProperties ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="false" Output="true" />
</ParameterGroup>
</UsingTask>

<!-- @(NativeReference) is used by msbuild for native references too, and these targets get triggered by
them. But for wasm, we need different handling, so stub these out -->
<Target Name="ResolveNativeReferences" />
<Target Name="GenerateManifests" />
</Project>
2 changes: 1 addition & 1 deletion src/tests/BuildWasmApps/testassets/AppUsingSkiaSharp/AppUsingSkiaSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="SkiaSharp" Version="2.80.3" />
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.80.3" />

<NativeReference Include="$(SkiaSharpStaticLibraryPath)\2.0.9\*.a" />
<NativeFileReference Include="$(SkiaSharpStaticLibraryPath)\2.0.9\*.a" />
<WasmFilesToIncludeInFileSystem Include="$(MSBuildThisFileDirectory)mono.png" />
</ItemGroup>
</Project>