Add Linux x86, arm, arm64 Compilation

.github/actions/build-skia/action.yml

@@ -47,6 +47,4 @@ runs:
     - uses: actions/cache/save@v3
       with:
         path: dist
-        key: alphaskia-${{ inputs.target-os }}-${{ inputs.architecture }}-${{ inputs.variant }}-${{ github.run_id }} 
-
-
+        key: alphaskia-${{ inputs.target-os }}-${{ inputs.architecture }}-${{ inputs.variant }}-${{ github.run_id }} 

.github/workflows/build.yml

@@ -48,8 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        architecture: [x64]
-        # TODO architecture: [x64, x86, arm64]
+        architecture: [x64, x86, arm, arm64]
         variant: ['shared', 'static']
     steps:
       - uses: actions/checkout@v3
@@ -65,8 +64,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # TODO architecture: [x64, x86, arm64]
-        architecture: [x64]
+        architecture: [x64, x86, arm, arm64]
         variant: ['shared']
     steps:
       - uses: actions/checkout@v3

build/Build.Linux.cs

@@ -1,7 +1,73 @@
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Nuke.Common.IO;
+using Nuke.Common.Tooling;
 
 partial class Build
 {
+    void InstallDependenciesLinux()
+    {
+        if (!IsGitHubActions)
+        {
+            return;
+        }
+
+        var bash = ToolResolver.GetPathTool("bash");
+        var sudo = ToolResolver.GetPathTool("sudo");
+        var dependenciesScript = SkiaPath / "tools" / "install_dependencies.sh";
+        if (dependenciesScript.FileExists())
+        {
+            bash($"{dependenciesScript}", workingDirectory: SkiaPath);
+        }
+
+        // Linux cross compilation
+        if (Architecture != Architecture.X64 && TargetOs == TargetOperatingSystem.Linux)
+        {
+            var linuxArch = Architecture.LinuxArch;
+
+            var crossInstallDependencies = new StringBuilder();
+            crossInstallDependencies.AppendLine("#!/bin/bash");
+            crossInstallDependencies.AppendLine("set -e");
+
+            // Using aptitude here because github actions runners have quite some packages preinstalled
+            // which leads to many version conflicts after adding more sources. aptitude can resolve those 
+            // conflicts easier
+            crossInstallDependencies.AppendLine("echo Install Aptitude");
+            crossInstallDependencies.AppendLine("apt-get update");
+            crossInstallDependencies.AppendLine("apt-get install -y aptitude");
+
+            crossInstallDependencies.AppendLine($"echo Adding Arch {linuxArch}");
+            crossInstallDependencies.AppendLine($"dpkg --add-architecture {linuxArch}");
+
+            crossInstallDependencies.AppendLine("echo Modifying sources.list");
+            crossInstallDependencies.AppendLine("sed -i \"s/deb /deb [arch=amd64,i386] /\" /etc/apt/sources.list");
+            crossInstallDependencies.AppendLine("sed -i \"s/deb-src /deb-src [arch=amd64,i386] /\" /etc/apt/sources.list");
+
+            if (Architecture == Architecture.Arm || Architecture == Architecture.Arm64)
+            {
+                crossInstallDependencies.AppendLine($"echo 'deb [arch={linuxArch}] http://ports.ubuntu.com/ubuntu-ports/ jammy main multiverse universe' >> /etc/apt/sources.list");
+                crossInstallDependencies.AppendLine(
+                    $"echo 'deb [arch={linuxArch}] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main multiverse universe' >> /etc/apt/sources.list");
+                crossInstallDependencies.AppendLine(
+                    $"echo 'deb [arch={linuxArch}] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main multiverse universe' >> /etc/apt/sources.list");
+                crossInstallDependencies.AppendLine(
+                    $"echo 'deb [arch={linuxArch}] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main multiverse universe' >> /etc/apt/sources.list");
+            }
+            crossInstallDependencies.AppendLine("echo Updating Packages");
+            crossInstallDependencies.AppendLine("apt-get update");
+            crossInstallDependencies.AppendLine("echo Installing main build tools");
+            crossInstallDependencies.AppendLine($"aptitude install -y crossbuild-essential-{linuxArch} libstdc++-11-dev-{linuxArch}-cross");
+            crossInstallDependencies.AppendLine("echo Installing arch libs");
+            crossInstallDependencies.AppendLine($"aptitude install -y libfontconfig-dev:{linuxArch} libgl1-mesa-dev:{linuxArch} libglu1-mesa-dev:{linuxArch} freeglut3-dev:{linuxArch}");
+
+            var scriptFile = SkiaPath / "tools" / "cross_install_dependencies.sh";
+            File.WriteAllText(scriptFile, crossInstallDependencies.ToString());
+            sudo($"bash {scriptFile}");
+        }
+    }
+
     void BuildLibAlphaSkiaLinux()
     {
         var gnArgs = new Dictionary<string, string>();
@@ -53,28 +119,38 @@ void BuildSkiaLinux(string buildTarget, Dictionary<string, string> gnArgs,
     void SetClangLinux(Dictionary<string, string> gnArgs)
     {
         AppendToFlagList(gnArgs, "extra_cflags", "'-DHAVE_SYSCALL_GETRANDOM', '-DXML_DEV_URANDOM'");
+        AppendToFlagList(gnArgs, "extra_ldflags", "'-static-libstdc++', '-static-libgcc'");
 
-        if (Architecture == Architecture.X64)
-        {
-            gnArgs["cc"] = "clang";
-            gnArgs["cxx"] = "'clang++'";
-            AppendToFlagList(gnArgs, "extra_ldflags", "'-static-libstdc++', '-static-libgcc'");
-        }
-        else if (Architecture == Architecture.X86)
-        {
-            // TODO
-            gnArgs["cc"] = "clang";
-            gnArgs["cxx"] = "'clang++'";
-            AppendToFlagList(gnArgs, "extra_ldflags", "'-static-libstdc++', '-static-libgcc'");
-        }
-        else if (Architecture == Architecture.Arm64) // aka AArch64
+        gnArgs["cc"] = "clang";
+        gnArgs["cxx"] = "'clang++'";
+
+        var crossCompileToolchainArch = Architecture.LinuxCrossToolchain;
+        var crossCompileTargetArch = Architecture.LinuxCrossTargetArch;
+
+        if (!string.IsNullOrEmpty(crossCompileToolchainArch) && TargetOs == TargetOperatingSystem.Linux)
         {
-            // TODO
-            gnArgs["cc"] = "clang";
-            gnArgs["cxx"] = "'clang++'";
-            AppendToFlagList(gnArgs, "extra_ldflags", "'-static-libstdc++', '-static-libgcc'");
-        }
+            var sysroot = $"/usr/{crossCompileToolchainArch}";
+            var init = $"'--target={crossCompileTargetArch}'";
+            var bin = $"'-B{sysroot}/bin/' ";
+            var libs = $"'-L/usr/lib/{crossCompileToolchainArch}'";
 
-        // gnArgs["ar"] = "llvm-ar";
+            AbsolutePath sysRootPath = sysroot;
+            var newestCpp = Directory.EnumerateDirectories(sysRootPath / "include" / "c++")
+                .Select(Path.GetFileName)
+                .OrderByDescending(x => x)
+                .First();
+
+            var includes =
+                $"'-I{sysroot}/include', " +
+                $"'-I{sysroot}/include/c++/{newestCpp}', " +
+                $"'-I{sysroot}/include/c++/{newestCpp}/{crossCompileToolchainArch}', " +
+                $"'-I/usr/include/{crossCompileToolchainArch}', " +
+                // non arch specific headers last (as system header to ensure it is really last, normal -I will fail)
+                $"'-isystem/usr/include/' ";
+
+            AppendToFlagList(gnArgs, "extra_asmflags", $"{init}, '-no-integrated-as', {bin}, {includes}");
+            AppendToFlagList(gnArgs, "extra_ldflags", $"{init}, {bin}, {libs}");
+            AppendToFlagList(gnArgs, "extra_cflags", $"{init}, {bin}, {includes}");
+        }
     }
 }

build/Build.Native.cs

@@ -15,16 +15,16 @@
 public class TargetOperatingSystem : Enumeration
 {
     public static TargetOperatingSystem Windows = new()
-        { Value = "windows", SkiaTargetOs = "win", RuntimeIdentifier = "win" };
+    { Value = "windows", SkiaTargetOs = "win", RuntimeIdentifier = "win" };
 
     public static TargetOperatingSystem Linux = new()
-        { Value = "linux", SkiaTargetOs = "linux", RuntimeIdentifier = "linux" };
+    { Value = "linux", SkiaTargetOs = "linux", RuntimeIdentifier = "linux" };
 
     public static TargetOperatingSystem Android = new()
-        { Value = "android", SkiaTargetOs = "android", RuntimeIdentifier = "android" };
+    { Value = "android", SkiaTargetOs = "android", RuntimeIdentifier = "android" };
 
     public static TargetOperatingSystem MacOs = new()
-        { Value = "macos", SkiaTargetOs = "mac", RuntimeIdentifier = "macos" };
+    { Value = "macos", SkiaTargetOs = "mac", RuntimeIdentifier = "macos" };
 
     public string SkiaTargetOs { get; private set; }
     public string RuntimeIdentifier { get; private set; }
@@ -33,10 +33,14 @@ public class TargetOperatingSystem : Enumeration
 [TypeConverter(typeof(TypeConverter<Architecture>))]
 public class Architecture : Enumeration
 {
-    public static Architecture X64 = new() { Value = "x64" };
-    public static Architecture X86 = new() { Value = "x86" };
-    public static Architecture Arm = new() { Value = "arm" };
-    public static Architecture Arm64 = new() { Value = "arm64" };
+    public static Architecture X64 = new() { Value = "x64", LinuxArch = "amd64", LinuxCrossToolchain = "", LinuxCrossTargetArch = ""};
+    public static Architecture X86 = new() { Value = "x86", LinuxArch = "i386", LinuxCrossToolchain = "i686-linux-gnu", LinuxCrossTargetArch = "i686-linux-gnu"};
+    public static Architecture Arm = new() { Value = "arm", LinuxArch = "armhf", LinuxCrossToolchain = "arm-linux-gnueabihf", LinuxCrossTargetArch = "armv7a-linux-gnueabihf"};
+    public static Architecture Arm64 = new() { Value = "arm64", LinuxArch = "arm64", LinuxCrossToolchain = "aarch64-linux-gnu", LinuxCrossTargetArch = "aarch64-linux-gnu"};
+
+    public string LinuxArch { get; private set; }
+    public string LinuxCrossToolchain { get; private set; }
+    public string LinuxCrossTargetArch { get; private set; }
 }
 
 [TypeConverter(typeof(TypeConverter<Variant>))]
@@ -130,7 +134,8 @@ partial class Build
         .Requires(() => Architecture)
         .Requires(() => Variant)
         .Requires(() => TargetOs)
-        .Before(SetupDepotTools) // ensure it runs before any oher targets
+        // ensure it runs before any oher targets
+        .Before(SetupDepotTools, PatchSkiaBuildFiles, GitSyncDepsLibAlphaSkia)
         .Executes(() =>
         {
             if (SkipLibAlphaSkia)
@@ -143,8 +148,7 @@ partial class Build
                 GitTool("submodule update --init --recursive");
                 if (OperatingSystem.IsLinux())
                 {
-                    var dependenciesScript = SkiaPath / "tools" / "install_dependencies.sh";
-                    ToolResolver.GetPathTool("bash")($"{dependenciesScript}", workingDirectory: SkiaPath);   
+                    InstallDependenciesLinux();
                 }
             }
         })
@@ -183,6 +187,12 @@ partial class Build
         .Requires(() => TargetOs)
         .Executes(() =>
         {
+            GitTool("submodule update --init --recursive");
+            if (OperatingSystem.IsLinux())
+            {
+                InstallDependenciesLinux();
+            }
+
             if (TargetOs == TargetOperatingSystem.Windows)
             {
                 BuildLibAlphaSkiaJniWindows();