Support arm64 native asserts for Tizen

mono · Nov 25, 2022 · 9fae8f4 · 9fae8f4
1 parent 1131738
commit 9fae8f4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 42 deletions.
diff --git a/binding/HarfBuzzSharp/nuget/build/tizen40/HarfBuzzSharp.targets b/binding/HarfBuzzSharp/nuget/build/tizen40/HarfBuzzSharp.targets
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <PropertyGroup>
-    <_HarfBuzzSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_HarfBuzzSharpNativeLibraryCurrPath>
-    <_HarfBuzzSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_HarfBuzzSharpNativeLibraryCurrPath)'))</_HarfBuzzSharpNativeLibraryDirName>
-    <_HarfBuzzSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_HarfBuzzSharpNativeLibraryDirName)\</_HarfBuzzSharpNativeLibraryRootDir>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <TizenTpkFiles Include="$(_HarfBuzzSharpNativeLibraryRootDir)x86\libHarfBuzzSharp.so">
-      <Visible>false</Visible>
-      <TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir>
-      <TizenTpkFileName>libHarfBuzzSharp.so</TizenTpkFileName>
-    </TizenTpkFiles>
-    <TizenTpkFiles Include="$(_HarfBuzzSharpNativeLibraryRootDir)arm\libHarfBuzzSharp.so">
-      <Visible>false</Visible>
-      <TizenTpkSubDir>bin\runtimes\tizen-armel\native\</TizenTpkSubDir>
-      <TizenTpkFileName>libHarfBuzzSharp.so</TizenTpkFileName>
-    </TizenTpkFiles>
-  </ItemGroup>
-
 </Project>
diff --git a/binding/SkiaSharp/nuget/build/tizen40/SkiaSharp.targets b/binding/SkiaSharp/nuget/build/tizen40/SkiaSharp.targets
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <PropertyGroup>
-    <_SkiaSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_SkiaSharpNativeLibraryCurrPath>
-    <_SkiaSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_SkiaSharpNativeLibraryCurrPath)'))</_SkiaSharpNativeLibraryDirName>
-    <_SkiaSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_SkiaSharpNativeLibraryDirName)\</_SkiaSharpNativeLibraryRootDir>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <TizenTpkFiles Include="$(_SkiaSharpNativeLibraryRootDir)x86\libSkiaSharp.so">
-      <Visible>false</Visible>
-      <TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir>
-      <TizenTpkFileName>libSkiaSharp.so</TizenTpkFileName>
-    </TizenTpkFiles>
-    <TizenTpkFiles Include="$(_SkiaSharpNativeLibraryRootDir)arm\libSkiaSharp.so">
-      <Visible>false</Visible>
-      <TizenTpkSubDir>bin\runtimes\tizen-armel\native\</TizenTpkSubDir>
-      <TizenTpkFileName>libSkiaSharp.so</TizenTpkFileName>
-    </TizenTpkFiles>
-  </ItemGroup>
-
 </Project>
diff --git a/native/tizen/build.cake b/native/tizen/build.cake
@@ -15,6 +15,7 @@ Task("libSkiaSharp")
     .Does(() =>
 {
     Build("armel", "arm", "mobile-4.0-device.core");
+    Build("arm64", "arm64", "mobile-4.0-device.core");
     Build("i386", "x86", "mobile-4.0-emulator.core");
 
     void Build(string arch, string skiaArch, string rootstrap)
@@ -54,6 +55,7 @@ Task("libHarfBuzzSharp")
     .Does(() =>
 {
     Build("armel", "arm", "mobile-4.0-device.core");
+    Build("arm64", "arm64", "mobile-4.0-device.core");
     Build("i386", "x86", "mobile-4.0-emulator.core");
 
     void Build(string arch, string cliArch, string rootstrap)

diff --git a/nuget/HarfBuzzSharp.NativeAssets.Tizen.nuspec b/nuget/HarfBuzzSharp.NativeAssets.Tizen.nuspec
@@ -29,6 +29,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <dependencies>
       <group targetFramework="tizen40">
       </group>
+      <group targetFramework="net6.0-tizen7.0">
+      </group>
     </dependencies>
 
   </metadata>
@@ -39,11 +41,14 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/tizen40/HarfBuzzSharp.targets" target="buildTransitive/tizen40/HarfBuzzSharp.NativeAssets.Tizen.targets" />
 
     <!-- libHarfBuzzSharp.dll and other native files -->
-    <file src="build/tizen40/arm/libHarfBuzzSharp.so" />
-    <file src="build/tizen40/x86/libHarfBuzzSharp.so" />
+    <file src="runtimes/linux-x86/native/libHarfBuzzSharp.so" />
+    <file src="runtimes/tizen-x86/native/libHarfBuzzSharp.so" />
+    <file src="runtimes/tizen-armel/native/libHarfBuzzSharp.so" />
+    <file src="runtimes/tizen-arm64/native/libHarfBuzzSharp.so" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/tizen40/_._" />
+    <file src="_._" target="lib/net6.0-tizen7.0/_._" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />

diff --git a/nuget/SkiaSharp.NativeAssets.Tizen.nuspec b/nuget/SkiaSharp.NativeAssets.Tizen.nuspec
@@ -30,6 +30,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <dependencies>
       <group targetFramework="tizen40">
       </group>
+      <group targetFramework="net6.0-tizen7.0">
+      </group>
     </dependencies>
 
   </metadata>
@@ -40,11 +42,14 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/tizen40/SkiaSharp.targets" target="buildTransitive/tizen40/SkiaSharp.NativeAssets.Tizen.targets" />
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file src="build/tizen40/arm/libSkiaSharp.so" />
-    <file src="build/tizen40/x86/libSkiaSharp.so" />
+    <file src="runtimes/linux-x86/native/libSkiaSharp.so" />
+    <file src="runtimes/tizen-x86/native/libSkiaSharp.so" />
+    <file src="runtimes/tizen-armel/native/libSkiaSharp.so" />
+    <file src="runtimes/tizen-arm64/native/libSkiaSharp.so" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/tizen40/_._" />
+    <file src="_._" target="lib/net6.0-tizen7.0/_._" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />