Fix build.

JetBrains · Nov 18, 2020 · 9cc5261 · 9cc5261
1 parent 09d1b61
commit 9cc5261
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/samples/SkijaInjectSample/build.gradle b/samples/SkijaInjectSample/build.gradle
@@ -23,7 +23,7 @@ if (osName == "Mac OS X") {
 } else if (osName.startsWith("Linux")) {
     targetOs = "linux"
 } else {
-    throw Error("Unsupported OS: $os")
+    throw Error("Unsupported OS: $osName")
 }
 def osArch = System.getProperty("os.arch")
 def targetArch = ""

diff --git a/skiko/buildSrc/src/main/kotlin/properties.kt b/skiko/buildSrc/src/main/kotlin/properties.kt
@@ -27,11 +27,9 @@ val hostOs by lazy {
 }
 
 val hostArch by lazy {
-    val osArch = System.getProperty("os.arch").also {
-        println("arch is $it")
-    }
+    val osArch = System.getProperty("os.arch")
     when (osArch) {
-        "x86_64" -> Arch.X64
+        "x86_64", "amd64" -> Arch.X64
         "aarch64" -> Arch.Arm64
         else -> throw Error("Unknown arch $osArch")
     }