Add msm_dpu driver for freedreno

[waydroid.git] / tools / actions / initializer.py

diff --git a/tools/actions/initializer.py b/tools/actions/initializer.py
index fdc4a40a3c6a3a6d58f654114158722e3a6086fb..fee12801c9901066dba98289a2c327d40e720966 100644 (file)
--- a/tools/actions/initializer.py
+++ b/tools/actions/initializer.py
@@ -23,6 +23,8 @@ def get_vendor_type(args):
     ret = "MAINLINE"
     if vndk_str != "":
         vndk = int(vndk_str)
     ret = "MAINLINE"
     if vndk_str != "":
         vndk = int(vndk_str)

+        if vndk > 31:
+            vndk -= 1 # 12L -> Halium 12

         if vndk > 19:
             ret = "HALIUM_" + str(vndk - 19)
 
         if vndk > 19:
             ret = "HALIUM_" + str(vndk - 19)
 


@@ -113,8 +115,13 @@ def init(args):
             status = helpers.lxc.status(args)
         if status != "STOPPED":
             logging.info("Stopping container")
             status = helpers.lxc.status(args)
         if status != "STOPPED":
             logging.info("Stopping container")

-            helpers.lxc.stop(args)
-        helpers.images.umount_rootfs(args)
+            try:
+                container = tools.helpers.ipc.DBusContainerService()
+                args.session = container.GetSession()
+                container.Stop(False)
+            except Exception as e:
+                logging.debug(e)
+                tools.actions.container_manager.stop(args)

         if args.images_path not in tools.config.defaults["preinstalled_images_paths"]:
             helpers.images.get(args)
         else:
         if args.images_path not in tools.config.defaults["preinstalled_images_paths"]:
             helpers.images.get(args)
         else:


@@ -128,13 +135,17 @@ def init(args):
             os.mkdir(tools.config.defaults["overlay_rw"])
             os.mkdir(tools.config.defaults["overlay_rw"]+"/system")
             os.mkdir(tools.config.defaults["overlay_rw"]+"/vendor")
             os.mkdir(tools.config.defaults["overlay_rw"])
             os.mkdir(tools.config.defaults["overlay_rw"]+"/system")
             os.mkdir(tools.config.defaults["overlay_rw"]+"/vendor")

+        helpers.drivers.probeAshmemDriver(args)

         helpers.lxc.setup_host_perms(args)
         helpers.lxc.set_lxc_config(args)
         helpers.lxc.make_base_props(args)
         if status != "STOPPED":
             logging.info("Starting container")
         helpers.lxc.setup_host_perms(args)
         helpers.lxc.set_lxc_config(args)
         helpers.lxc.make_base_props(args)
         if status != "STOPPED":
             logging.info("Starting container")

-            helpers.images.mount_rootfs(args, args.images_path)
-            helpers.lxc.start(args)
+            try:
+                container.Start(args.session)
+            except Exception as e:
+                logging.debug(e)
+                logging.error("Failed to restart container. Please do so manually.")

 
         if "running_init_in_service" not in args or not args.running_init_in_service:
             try:
 
         if "running_init_in_service" not in args or not args.running_init_in_service:
             try:


@@ -284,7 +295,7 @@ def remote_init_client(args):
             channels_cfg = tools.config.load_channels()
 
             self.set_default_size(600, 250)
             channels_cfg = tools.config.load_channels()
 
             self.set_default_size(600, 250)

-            self.set_icon_from_file(tools.config.tools_src + "/data/AppIcon.png")
+            self.set_icon_name("waydroid")

 
             grid = Gtk.Grid(row_spacing=6, column_spacing=6, margin=10, column_homogeneous=True)
             grid.set_hexpand(True)
 
             grid = Gtk.Grid(row_spacing=6, column_spacing=6, margin=10, column_homogeneous=True)
             grid.set_hexpand(True)