Skip to content

Commit 82869ff

Browse files
rookiejavarookiejava
committed
Support arm64 native asserts for Tizen
1 parent 1131738 commit 82869ff

File tree

8 files changed

+25
-46
lines changed

8 files changed

+25
-46
lines changed

‎binding/HarfBuzzSharp.Classic/HarfBuzzSharp.Classic.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@
4141
</ItemGroup>
4242
<ItemGroup Condition="'$(TargetFramework)' == 'tizen40'">
4343
<!-- Tizen -->
44-
<None Include="..\..\output\native\tizen\armel\libHarfBuzzSharp.*" Link="nuget\build\$(TargetFramework)\arm\%(Filename)%(Extension)" />
45-
<None Include="..\..\output\native\tizen\i386\libHarfBuzzSharp.*" Link="nuget\build\$(TargetFramework)\x86\%(Filename)%(Extension)" />
44+
<None Include="..\..\output\native\tizen\armel\libHarfBuzzSharp.*" Link="nuget\runtimes\tizen-armel\%(Filename)%(Extension)" />
45+
<None Include="..\..\output\native\tizen\arm64\libHarfBuzzSharp.*" Link="nuget\runtimes\tizen-arm64\%(Filename)%(Extension)" />
46+
<None Include="..\..\output\native\tizen\i386\libHarfBuzzSharp.*" Link="nuget\runtimes\tizen-x86\%(Filename)%(Extension)" />
47+
<None Include="..\..\output\native\tizen\i386\libHarfBuzzSharp.*" Link="nuget\runtimes\linux-x86\%(Filename)%(Extension)" />
4648
<None Include="..\HarfBuzzSharp\nuget\build\tizen40\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
4749
</ItemGroup>
4850
<ItemGroup Condition="$(TargetFramework.StartsWith('uap10'))">

‎binding/HarfBuzzSharp/nuget/build/tizen40/HarfBuzzSharp.targets

-19
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4-
<PropertyGroup>
5-
<_HarfBuzzSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_HarfBuzzSharpNativeLibraryCurrPath>
6-
<_HarfBuzzSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_HarfBuzzSharpNativeLibraryCurrPath)'))</_HarfBuzzSharpNativeLibraryDirName>
7-
<_HarfBuzzSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_HarfBuzzSharpNativeLibraryDirName)\</_HarfBuzzSharpNativeLibraryRootDir>
8-
</PropertyGroup>
9-
10-
<ItemGroup>
11-
<TizenTpkFiles Include="$(_HarfBuzzSharpNativeLibraryRootDir)x86\libHarfBuzzSharp.so">
12-
<Visible>false</Visible>
13-
<TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir>
14-
<TizenTpkFileName>libHarfBuzzSharp.so</TizenTpkFileName>
15-
</TizenTpkFiles>
16-
<TizenTpkFiles Include="$(_HarfBuzzSharpNativeLibraryRootDir)arm\libHarfBuzzSharp.so">
17-
<Visible>false</Visible>
18-
<TizenTpkSubDir>bin\runtimes\tizen-armel\native\</TizenTpkSubDir>
19-
<TizenTpkFileName>libHarfBuzzSharp.so</TizenTpkFileName>
20-
</TizenTpkFiles>
21-
</ItemGroup>
22-
234
</Project>

‎binding/SkiaSharp.Classic/SkiaSharp.Classic.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@
4040
</ItemGroup>
4141
<ItemGroup Condition="'$(TargetFramework)' == 'tizen40'">
4242
<!-- Tizen -->
43-
<None Include="..\..\output\native\tizen\armel\libSkiaSharp.*" Link="nuget\build\$(TargetFramework)\arm\libSkiaSharp.so" />
44-
<None Include="..\..\output\native\tizen\i386\libSkiaSharp.*" Link="nuget\build\$(TargetFramework)\x86\libSkiaSharp.so" />
43+
<None Include="..\..\output\native\tizen\armel\libSkiaSharp.*" Link="nuget\runtimes\tizen-armel\libSkiaSharp.so" />
44+
<None Include="..\..\output\native\tizen\arm64\libSkiaSharp.*" Link="nuget\runtimes\tizen-arm64\libSkiaSharp.so" />
45+
<None Include="..\..\output\native\tizen\i386\libSkiaSharp.*" Link="nuget\runtimes\tizen-x86\libSkiaSharp.so" />
46+
<None Include="..\..\output\native\tizen\i386\libSkiaSharp.*" Link="nuget\runtimes\linux-x86\libSkiaSharp.so" />
4547
<None Include="..\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets" Link="nuget\build\$(TargetFramework)\SkiaSharp.targets" />
4648
</ItemGroup>
4749
<ItemGroup Condition="$(TargetFramework.StartsWith('uap10'))">

‎binding/SkiaSharp/nuget/build/tizen40/SkiaSharp.targets

-19
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4-
<PropertyGroup>
5-
<_SkiaSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_SkiaSharpNativeLibraryCurrPath>
6-
<_SkiaSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_SkiaSharpNativeLibraryCurrPath)'))</_SkiaSharpNativeLibraryDirName>
7-
<_SkiaSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_SkiaSharpNativeLibraryDirName)\</_SkiaSharpNativeLibraryRootDir>
8-
</PropertyGroup>
9-
10-
<ItemGroup>
11-
<TizenTpkFiles Include="$(_SkiaSharpNativeLibraryRootDir)x86\libSkiaSharp.so">
12-
<Visible>false</Visible>
13-
<TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir>
14-
<TizenTpkFileName>libSkiaSharp.so</TizenTpkFileName>
15-
</TizenTpkFiles>
16-
<TizenTpkFiles Include="$(_SkiaSharpNativeLibraryRootDir)arm\libSkiaSharp.so">
17-
<Visible>false</Visible>
18-
<TizenTpkSubDir>bin\runtimes\tizen-armel\native\</TizenTpkSubDir>
19-
<TizenTpkFileName>libSkiaSharp.so</TizenTpkFileName>
20-
</TizenTpkFiles>
21-
</ItemGroup>
22-
234
</Project>

‎cake/native-shared.cake

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ bool Skip(string arch)
101101
case "armv7k":
102102
arch = "arm";
103103
break;
104+
case "arm64":
104105
case "arm64_32":
105106
case "arm64-v8a":
106107
arch = "arm64";

‎native/tizen/build.cake

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Task("libSkiaSharp")
1515
.Does(() =>
1616
{
1717
Build("armel", "arm", "mobile-4.0-device.core");
18+
Build("arm64", "arm64", "mobile-4.0-device.core");
1819
Build("i386", "x86", "mobile-4.0-emulator.core");
1920

2021
void Build(string arch, string skiaArch, string rootstrap)
@@ -54,6 +55,7 @@ Task("libHarfBuzzSharp")
5455
.Does(() =>
5556
{
5657
Build("armel", "arm", "mobile-4.0-device.core");
58+
Build("arm64", "arm64", "mobile-4.0-device.core");
5759
Build("i386", "x86", "mobile-4.0-emulator.core");
5860

5961
void Build(string arch, string cliArch, string rootstrap)

‎nuget/HarfBuzzSharp.NativeAssets.Tizen.nuspec

+7-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
2929
<dependencies>
3030
<group targetFramework="tizen40">
3131
</group>
32+
<group targetFramework="net6.0-tizen7.0">
33+
</group>
3234
</dependencies>
3335

3436
</metadata>
@@ -39,11 +41,14 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
3941
<file src="build/tizen40/HarfBuzzSharp.targets" target="buildTransitive/tizen40/HarfBuzzSharp.NativeAssets.Tizen.targets" />
4042

4143
<!-- libHarfBuzzSharp.dll and other native files -->
42-
<file src="build/tizen40/arm/libHarfBuzzSharp.so" />
43-
<file src="build/tizen40/x86/libHarfBuzzSharp.so" />
44+
<file src="runtimes/linux-x86/native/libHarfBuzzSharp.so" />
45+
<file src="runtimes/tizen-x86/native/libHarfBuzzSharp.so" />
46+
<file src="runtimes/tizen-armel/native/libHarfBuzzSharp.so" />
47+
<file src="runtimes/tizen-arm64/native/libHarfBuzzSharp.so" />
4448

4549
<!-- placeholders -->
4650
<file src="_._" target="lib/tizen40/_._" />
51+
<file src="_._" target="lib/net6.0-tizen7.0/_._" />
4752

4853
<!-- legal -->
4954
<file src="LICENSE.txt" />

‎nuget/SkiaSharp.NativeAssets.Tizen.nuspec

+7-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
3030
<dependencies>
3131
<group targetFramework="tizen40">
3232
</group>
33+
<group targetFramework="net6.0-tizen7.0">
34+
</group>
3335
</dependencies>
3436

3537
</metadata>
@@ -40,11 +42,14 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
4042
<file src="build/tizen40/SkiaSharp.targets" target="buildTransitive/tizen40/SkiaSharp.NativeAssets.Tizen.targets" />
4143

4244
<!-- libSkiaSharp.dll and other native files -->
43-
<file src="build/tizen40/arm/libSkiaSharp.so" />
44-
<file src="build/tizen40/x86/libSkiaSharp.so" />
45+
<file src="runtimes/linux-x86/native/libSkiaSharp.so" />
46+
<file src="runtimes/tizen-x86/native/libSkiaSharp.so" />
47+
<file src="runtimes/tizen-armel/native/libSkiaSharp.so" />
48+
<file src="runtimes/tizen-arm64/native/libSkiaSharp.so" />
4549

4650
<!-- placeholders -->
4751
<file src="_._" target="lib/tizen40/_._" />
52+
<file src="_._" target="lib/net6.0-tizen7.0/_._" />
4853

4954
<!-- legal -->
5055
<file src="LICENSE.txt" />

0 commit comments

Comments
 (0)