From 10e1a14c94d6500f3889f48dbde8c1c08853a722 Mon Sep 17 00:00:00 2001 From: Erfan Abdi Date: Tue, 19 Oct 2021 06:26:45 +0330 Subject: [PATCH] lxc: Skip host_perms on non treble devices --- tools/helpers/lxc.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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"]) -- 2.47.3