debian: Use new polkitd package

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

diff --git a/tools/helpers/arch.py b/tools/helpers/arch.py
index af18e668515bbfe92c482a3fbac330a79495b23e..c74ef906574fbc1533e316ecd6e9e7b0c450a9fd 100644 (file)
--- a/tools/helpers/arch.py
+++ b/tools/helpers/arch.py
@@ -19,10 +19,15 @@ def host():
                      " architecture is not supported")
 
 def maybe_remap(target):
                      " architecture is not supported")
 
 def maybe_remap(target):

-    if target == "x86_64":
+    if target.startswith("x86"):

         with open("/proc/cpuinfo") as f:
         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"
+            cpuinfo = f.read()
+        if "ssse3" not in cpuinfo:
+            raise ValueError("x86/x86_64 CPU must support SSSE3!")
+        if target == "x86_64" and "sse4_2" not in cpuinfo:
+            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
 
     return target