From: Erfan Abdi <erfangplus@gmail.com>
Date: Tue, 19 Oct 2021 02:56:45 +0000 (+0330)
Subject: lxc: Skip host_perms on non treble devices
X-Git-Tag: 1.2.0~7
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/10e1a14c94d6500f3889f48dbde8c1c08853a722?ds=inline

lxc: Skip host_perms on non treble devices
---

diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py
index 9caff23..220d4e6 100644
--- a/tools/helpers/lxc.py
+++ b/tools/helpers/lxc.py
@@ -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"])