build: fix alignment checker

Author: Danielku15

build/Build.Android.cs

@@ -40,7 +40,7 @@ partial class Build
 
             var readElfTool = ToolResolver.GetTool(llvmReadElf);
 
-            var libDir = GetLibDirectory(variant: Variant);
+            var libDir = GetLibDirectory(GetAlphaSkiaLibName(Variant), variant: Variant);
             var distPath = DistBasePath / libDir;
             var soFiles = distPath.GlobFiles("*.so").ToArray();
 

build/Build.LibAlphaSkia.cs

@@ -248,18 +248,9 @@ void BuildAlphaSkia()
         var staticLibPath = DistBasePath / GetLibDirectory(variant: Variant.Static);
         var gnFlags = new Dictionary<string, string>();
 
-        string buildTarget;
-        if (Variant == Variant.Static)
+        var buildTarget = GetAlphaSkiaLibName(Variant);
+        if (Variant == Variant.Jni)
         {
-            buildTarget = "libalphaskia";
-        }
-        else if (Variant == Variant.Shared)
-        {
-            buildTarget = "libalphaskia";
-        }
-        else if (Variant == Variant.Jni)
-        {
-            buildTarget = "libalphaskiajni";
 
             var alphaSkiaInclude = DistBasePath / "include";
             var jniInclude = JavaHome / "include";
@@ -293,8 +284,6 @@ void BuildAlphaSkia()
         }
         else if (Variant == Variant.Node)
         {
-            buildTarget = "libalphaskianode";
-
             if (OperatingSystem.IsWindows())
             {
                 // windows requires a lib to link against, fetch it from the node downloads
@@ -309,10 +298,6 @@ void BuildAlphaSkia()
                 AppendToFlagList(gnArgs, "extra_ldflags", "'-undefined', 'dynamic_lookup'");
             }
         }
-        else
-        {
-            throw new ArgumentException("Unknown variant: " + Variant);
-        }
 
         if (TargetOs == TargetOperatingSystem.Windows)
         {

build/Build.Native.cs

@@ -70,6 +70,10 @@ string GetLibDirectory(string libName = "libskia", TargetOperatingSystem targetO
         return $"{libName.ToLowerInvariant()}-{targetOs?.RuntimeIdentifier}-{arch}-{variant}";
     }
 
+    static string GetAlphaSkiaLibName(Variant variant) => variant == Variant.Jni ? "libalphaskiajni"
+        : variant == Variant.Node ? "libalphaskianode"
+        : "libalphaskia";
+
     Task GitSyncDepsCustom(string[] requiredDependencies)
     {
         var depsFile = SkiaPath / "DEPS";