From 7ab21908ef512afc5066f9a2e3b08d9ea7e609ae Mon Sep 17 00:00:00 2001 From: Erfan Abdi Date: Tue, 19 Oct 2021 06:32:42 +0330 Subject: [PATCH] lxc: Add non-treble camera support --- tools/helpers/lxc.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py index 220d4e6..eb290af 100644 --- a/tools/helpers/lxc.py +++ b/tools/helpers/lxc.py @@ -196,6 +196,15 @@ def make_base_props(args): if vulkan != "": props.append("ro.hardware.vulkan=" + vulkan) + treble = tools.helpers.props.host_get(args, "ro.treble.enabled") + if treble != "true": + camera = find_hal("camera") + if camera != "": + props.append("ro.hardware.camera=" + camera) + else: + if args.vendor_type == "MAINLINE": + props.append("ro.hardware.camera=v4l2") + opengles = tools.helpers.props.host_get(args, "ro.opengles.version") if opengles == "": opengles = "196608" @@ -207,7 +216,6 @@ def make_base_props(args): if args.vendor_type == "MAINLINE": props.append("ro.vndk.lite=true") - props.append("ro.hardware.camera=v4l2") base_props = open(args.work + "/waydroid_base.prop", "w") for prop in props: -- 2.47.3