X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/10e1a14c94d6500f3889f48dbde8c1c08853a722..71f9249c9e08e9abbd08f6ce95d2906c23cfe433:/tools/helpers/lxc.py diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py index 220d4e6..d57e63c 100644 --- a/tools/helpers/lxc.py +++ b/tools/helpers/lxc.py @@ -92,6 +92,12 @@ def generate_nodes_lxc_config(args): make_entry("/dev/sw_sync") make_entry("/sys/kernel/debug", options="rbind,create=dir,optional 0 0") + # Vibrator + make_entry("/sys/class/leds/vibrator", + options="bind,create=dir,optional 0 0") + make_entry("/sys/devices/virtual/timed_output/vibrator", + options="bind,create=dir,optional 0 0") + # Media dev nodes (for Mediatek) make_entry("/dev/Vcodec") make_entry("/dev/MTK_SMI") @@ -196,6 +202,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 +222,23 @@ def make_base_props(args): if args.vendor_type == "MAINLINE": props.append("ro.vndk.lite=true") - props.append("ro.hardware.camera=v4l2") + + for product in ["brand", "device", "manufacturer", "model", "name"]: + prop_product = tools.helpers.props.host_get( + args, "ro.product.vendor." + product) + if prop_product != "": + props.append("ro.product.waydroid." + product + "=" + prop_product) + else: + if os.path.isfile("/proc/device-tree/" + product): + with open("/proc/device-tree/" + product) as f: + f_value = f.read().strip().rstrip('\x00') + if f_value != "": + props.append("ro.product.waydroid." + + product + "=" + f_value) + + prop_fp = tools.helpers.props.host_get(args, "ro.vendor.build.fingerprint") + if prop_fp != "": + props.append("ro.build.fingerprint=" + prop_fp) base_props = open(args.work + "/waydroid_base.prop", "w") for prop in props: