Downgrade x86_64 to x86 if no SSE4.2

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

diff --git a/tools/helpers/drivers.py b/tools/helpers/drivers.py
index 25a5b62add623da00ecf032d87601b0d9acb2b6b..66744b3bc33d833cc4102eea1bfbcdcc139c26e6 100644 (file)
--- a/tools/helpers/drivers.py
+++ b/tools/helpers/drivers.py
@@ -12,16 +12,19 @@ import tools.helpers.run
 BINDER_DRIVERS = [
     "anbox-binder",
     "puddlejumper",
+    "bonder",
     "binder"
 ]
 VNDBINDER_DRIVERS = [
     "anbox-vndbinder",
     "vndpuddlejumper",
+    "vndbonder",
     "vndbinder"
 ]
 HWBINDER_DRIVERS = [
     "anbox-hwbinder",
     "hwpuddlejumper",
+    "hwbonder",
     "hwbinder"
 ]
 
@@ -86,7 +89,9 @@ def probeBinderDriver(args):
 
     if len(binder_dev_nodes) > 0:
         if not isBinderfsLoaded(args):
-            command = ["modprobe", "binder_linux"]
+            devices = ','.join(binder_dev_nodes)
+            command = ["modprobe", "binder_linux",
+                       "devices=\"{}\"".format(devices)]
             output = tools.helpers.run.user(args, command, check=False, output_return=True)
             if output:
                 logging.error("Failed to load binder driver")
@@ -171,3 +176,5 @@ def loadBinderNodes(args):
     args.BINDER_DRIVER = cfg["waydroid"]["binder"]
     args.VNDBINDER_DRIVER = cfg["waydroid"]["vndbinder"]
     args.HWBINDER_DRIVER = cfg["waydroid"]["hwbinder"]
+    args.BINDER_PROTOCOL = cfg["waydroid"]["binder_protocol"]
+    args.SERVICE_MANAGER_PROTOCOL = cfg["waydroid"]["service_manager_protocol"]