]> glassweightruler.freedombox.rocks Git - waydroid.git/commitdiff
lxc: Skip host_perms on non treble devices
authorErfan Abdi <erfangplus@gmail.com>
Tue, 19 Oct 2021 02:56:45 +0000 (06:26 +0330)
committerErfan Abdi <erfangplus@gmail.com>
Tue, 19 Oct 2021 02:56:45 +0000 (06:26 +0330)
tools/helpers/lxc.py

index 9caff23f506a93e0413276d694fb7f5c5bea12b1..220d4e6646b6df44ceaa6384ebe5542412616f7a 100644 (file)
@@ -216,6 +216,13 @@ def make_base_props(args):
 
 
 def setup_host_perms(args):
+    if not os.path.exists(tools.config.defaults["host_perms"]):
+        os.mkdir(tools.config.defaults["host_perms"])
+
+    treble = tools.helpers.props.host_get(args, "ro.treble.enabled")
+    if treble != "true":
+        return
+
     sku = tools.helpers.props.host_get(args, "ro.boot.product.hardware.sku")
     copy_list = []
     copy_list.extend(
@@ -233,9 +240,6 @@ def setup_host_perms(args):
             copy_list.append(
                 "/odm/etc/permissions/sku_{}/android.hardware.consumerir.xml".format(sku))
 
-    if not os.path.exists(tools.config.defaults["host_perms"]):
-        os.mkdir(tools.config.defaults["host_perms"])
-
     for filename in copy_list:
         shutil.copy(filename, tools.config.defaults["host_perms"])