From 17ffc696e1820309fed15e2e5847b482ac88edf8 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 3 Nov 2023 00:15:09 -0700 Subject: [PATCH] feat(waydroid): Set density and gralloc from /etc/default/waydroid-launcher before start --- .../shared/usr/bin/waydroid-container-start | 14 ++++++++++++++ .../shared/usr/etc/default/waydroid-launcher | 2 ++ 2 files changed, 16 insertions(+) diff --git a/system_files/desktop/shared/usr/bin/waydroid-container-start b/system_files/desktop/shared/usr/bin/waydroid-container-start index 0beb3f03..e5210ab1 100755 --- a/system_files/desktop/shared/usr/bin/waydroid-container-start +++ b/system_files/desktop/shared/usr/bin/waydroid-container-start @@ -1,3 +1,17 @@ #!/usr/bin/env bash +source /etc/default/waydroid-launcher + +# Ensure needed props are present +if ! grep -q "persist.waydroid.udev=true" "/var/lib/waydroid/waydroid_base.prop"; then + sudo sh -c 'echo "persist.waydroid.udev=true\n" >> /var/lib/waydroid/waydroid_base.prop' +fi + +if ! grep -q "persist.waydroid.uevent=true" "/var/lib/waydroid/waydroid_base.prop"; then + sudo sh -c 'persist.waydroid.uevent=true\n" >> /var/lib/waydroid/waydroid_base.prop' +fi + +sudo sed -i "s/ro.sf.lcd_density=.*/ro.sf.lcd_density=${WAYDROID_DENSITY:-215}/g" /var/lib/waydroid/waydroid_base.prop +sudo sed -i "s/ro.hardware.gralloc=.*/ro.hardware.gralloc=${WAYDROID_GRALLOC:-minigbm_gbm_mesa}/g" /var/lib/waydroid/waydroid_base.prop + sudo systemctl start waydroid-container.service diff --git a/system_files/desktop/shared/usr/etc/default/waydroid-launcher b/system_files/desktop/shared/usr/etc/default/waydroid-launcher index 0a8e0f3e..ad6177fb 100644 --- a/system_files/desktop/shared/usr/etc/default/waydroid-launcher +++ b/system_files/desktop/shared/usr/etc/default/waydroid-launcher @@ -1,2 +1,4 @@ WAYDROID_WIDTH=1280 WAYDROID_HEIGHT=800 +WAYDROID_DENSITY=215 +WAYDROID_GRALLOC=minigbm_gbm_mesa