From 82869ff66494c0b6869e0e521aceed7f6ef3f8ca Mon Sep 17 00:00:00 2001
From: Kangho Hur <kangho.hur@samsung.com>
Date: Fri, 25 Nov 2022 20:57:45 +0900
Subject: [PATCH] Support arm64 native asserts for Tizen

---
 .../HarfBuzzSharp.Classic.csproj              |  6 ++++--
 .../nuget/build/tizen40/HarfBuzzSharp.targets | 19 -------------------
 .../SkiaSharp.Classic.csproj                  |  6 ++++--
 .../nuget/build/tizen40/SkiaSharp.targets     | 19 -------------------
 cake/native-shared.cake                       |  1 +
 native/tizen/build.cake                       |  2 ++
 nuget/HarfBuzzSharp.NativeAssets.Tizen.nuspec |  9 +++++++--
 nuget/SkiaSharp.NativeAssets.Tizen.nuspec     |  9 +++++++--
 8 files changed, 25 insertions(+), 46 deletions(-)

diff --git a/binding/HarfBuzzSharp.Classic/HarfBuzzSharp.Classic.csproj b/binding/HarfBuzzSharp.Classic/HarfBuzzSharp.Classic.csproj
index 4f243f43e1..50a7ab9f9c 100644
--- a/binding/HarfBuzzSharp.Classic/HarfBuzzSharp.Classic.csproj
+++ b/binding/HarfBuzzSharp.Classic/HarfBuzzSharp.Classic.csproj
@@ -41,8 +41,10 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'tizen40'">
     <!-- Tizen -->
-    <None Include="..\..\output\native\tizen\armel\libHarfBuzzSharp.*" Link="nuget\build\$(TargetFramework)\arm\%(Filename)%(Extension)" />
-    <None Include="..\..\output\native\tizen\i386\libHarfBuzzSharp.*" Link="nuget\build\$(TargetFramework)\x86\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\tizen\armel\libHarfBuzzSharp.*" Link="nuget\runtimes\tizen-armel\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\tizen\arm64\libHarfBuzzSharp.*" Link="nuget\runtimes\tizen-arm64\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\tizen\i386\libHarfBuzzSharp.*" Link="nuget\runtimes\tizen-x86\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\tizen\i386\libHarfBuzzSharp.*" Link="nuget\runtimes\linux-x86\%(Filename)%(Extension)" />
     <None Include="..\HarfBuzzSharp\nuget\build\tizen40\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('uap10'))">
diff --git a/binding/HarfBuzzSharp/nuget/build/tizen40/HarfBuzzSharp.targets b/binding/HarfBuzzSharp/nuget/build/tizen40/HarfBuzzSharp.targets
index c7ff795e7e..33ebb029dc 100644
--- 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>
\ No newline at end of file
diff --git a/binding/SkiaSharp.Classic/SkiaSharp.Classic.csproj b/binding/SkiaSharp.Classic/SkiaSharp.Classic.csproj
index 65f93c73bf..3cb9a5edfb 100644
--- a/binding/SkiaSharp.Classic/SkiaSharp.Classic.csproj
+++ b/binding/SkiaSharp.Classic/SkiaSharp.Classic.csproj
@@ -40,8 +40,10 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'tizen40'">
     <!-- Tizen -->
-    <None Include="..\..\output\native\tizen\armel\libSkiaSharp.*" Link="nuget\build\$(TargetFramework)\arm\libSkiaSharp.so" />
-    <None Include="..\..\output\native\tizen\i386\libSkiaSharp.*" Link="nuget\build\$(TargetFramework)\x86\libSkiaSharp.so" />
+    <None Include="..\..\output\native\tizen\armel\libSkiaSharp.*" Link="nuget\runtimes\tizen-armel\libSkiaSharp.so" />
+    <None Include="..\..\output\native\tizen\arm64\libSkiaSharp.*" Link="nuget\runtimes\tizen-arm64\libSkiaSharp.so" />
+    <None Include="..\..\output\native\tizen\i386\libSkiaSharp.*" Link="nuget\runtimes\tizen-x86\libSkiaSharp.so" />
+    <None Include="..\..\output\native\tizen\i386\libSkiaSharp.*" Link="nuget\runtimes\linux-x86\libSkiaSharp.so" />
     <None Include="..\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets" Link="nuget\build\$(TargetFramework)\SkiaSharp.targets" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('uap10'))">
diff --git a/binding/SkiaSharp/nuget/build/tizen40/SkiaSharp.targets b/binding/SkiaSharp/nuget/build/tizen40/SkiaSharp.targets
index ff81317c8f..33ebb029dc 100644
--- 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>
\ No newline at end of file
diff --git a/cake/native-shared.cake b/cake/native-shared.cake
index 047f7df884..844bf89e82 100644
--- a/cake/native-shared.cake
+++ b/cake/native-shared.cake
@@ -101,6 +101,7 @@ bool Skip(string arch)
         case "armv7k":
             arch = "arm";
             break;
+        case "arm64":
         case "arm64_32":
         case "arm64-v8a":
             arch = "arm64";
diff --git a/native/tizen/build.cake b/native/tizen/build.cake
index 2b0078e337..f3ac3f80de 100644
--- 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
index a19bdc35c4..96c07ba164 100644
--- 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
index 4aec464b86..ac8174323a 100644
--- 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" />