hardware_manager: Validate upgrade zips against the saved ota channel

[waydroid.git] / tools / helpers / arch.py

diff --git a/tools/helpers/arch.py b/tools/helpers/arch.py
index 3c0bb76f18c2a36a3980ddf621bbfcd83dbf14b8..735d344e17c773223b81c2b3702730f6969037af 100644 (file)
--- a/tools/helpers/arch.py
+++ b/tools/helpers/arch.py
@@ -1,6 +1,7 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import platform
+import logging
 
 def host():
     machine = platform.machine()
@@ -9,9 +10,21 @@ def host():
         "i686": "x86",
         "x86_64": "x86_64",
         "aarch64": "arm64",
-        "armv7l": "arm"
+        "armv7l": "arm",
+        "armv8l": "arm"
     }
     if machine in mapping:
-        return mapping[machine]
+        return maybe_remap(mapping[machine])
     raise ValueError("platform.machine '" + machine + "'"
                      " architecture is not supported")
+
+def maybe_remap(target):
+    if target == "x86_64":
+        with open("/proc/cpuinfo") as f:
+            if "sse4_2" not in f.read():
+                logging.info("x86_64 CPU does not support SSE4.2, falling back to x86...")
+                return "x86"
+    elif target == "arm64" and platform.architecture()[0] == "32bit":
+        return "arm"
+
+    return target