anbox: Edit anbox-net script and run it

[waydroid.git] / scripts / install.sh

diff --git a/scripts/install.sh b/scripts/install.sh
index bbf35ac54edb289dd16c8198937b31ee6d909823..915cfb9ebbf953d95b0508d2778727adada2fb71 100644 (file)
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -1,32 +1,10 @@
 #!/bin/bash
 
 echo "Generating device properties"
 #!/bin/bash
 
 echo "Generating device properties"

-GRALLOC=`getprop ro.hardware.gralloc`
-if [ -z $GRALLOC ] || [ ! -f /vendor/lib/hw/gralloc.$GRALLOC.so ]; then
-    GRALLOC=`getprop ro.hardware`
-    if [ -z $GRALLOC ] || [ ! -f /vendor/lib/hw/gralloc.$GRALLOC.so ]; then
-        GRALLOC=`getprop ro.product.board`
-        if [ -z $GRALLOC ] || [ ! -f /vendor/lib/hw/gralloc.$GRALLOC.so ]; then
-            GRALLOC=`getprop ro.board.platform`
-            if [ -z $GRALLOC ] || [ ! -f /vendor/lib/hw/gralloc.$GRALLOC.so ]; then
-                GRALLOC=`getprop ro.arch`
-                if [ -z $GRALLOC ] || [ ! -f /vendor/lib/hw/gralloc.$GRALLOC.so ]; then
-                    GRALLOC="gbm"
-                fi
-            fi
-        fi
-    fi
-fi
-EGL=`getprop ro.hardware.egl`
-if [ ! -z $EGL ]; then
-    EGL_PROP="ro.hardware.egl=${EGL}"
-fi
-
-MEDIA_PROFILES=`getprop media.settings.xml`
-if [ ! -z $MEDIA_PROFILES ]; then
-    MEDIA_PROFILES_EXTRA=`getprop media.settings.xml | sed "s/vendor/vendor_extra/" | sed "s/odm/odm_extra/"`
-    MEDIA_PROFILES_PROP="media.settings.xml=${MEDIA_PROFILES_EXTRA}"
-fi
+rm -f generate-props.sh
+wget https://github.com/Anbox-halium/anbox-halium/raw/lineage-17.1/scripts/generate-props.sh
+chmod +x generate-props.sh
+. generate-props.sh

 
 echo "Asking for root access"
 sudo -s <<EOF
 
 echo "Asking for root access"
 sudo -s <<EOF


@@ -42,10 +20,13 @@ fi
 
 echo "Installing packages"
 apt update
 
 echo "Installing packages"
 apt update

-apt install -y qtwayland5 qml-module-qtwayland-compositor
-rm anbox-sensors_0.1.0_arm64.deb
-wget https://github.com/Anbox-halium/anbox-sensors/releases/download/v0.1.0/anbox-sensors_0.1.0_arm64.deb
-dpkg -i anbox-sensors_0.1.0_arm64.deb
+apt install -y lxc1 qtwayland5 qml-module-qtwayland-compositor
+apt install -y libgbinder sensorfw-qt5 libsensorfw-qt5-plugins || touch NO_SENSORS
+if [ ! -f NO_SENSORS ]; then
+    rm anbox-sensors_0.1.0_arm64.deb
+    wget https://github.com/Anbox-halium/anbox-sensors/releases/download/v0.1.0/anbox-sensors_0.1.0_arm64.deb
+    dpkg -i anbox-sensors_0.1.0_arm64.deb || touch NO_SENSORS
+fi

 
 echo "Geting anbox images"
 if [ -f anbox_arm64_system.img ]; then
 
 echo "Geting anbox images"
 if [ -f anbox_arm64_system.img ]; then


@@ -60,25 +41,43 @@ echo "Geting latest runner script"
 rm -f run-container.sh
 wget https://github.com/Anbox-halium/anbox-halium/raw/lineage-17.1/scripts/run-container.sh
 chmod +x run-container.sh
 rm -f run-container.sh
 wget https://github.com/Anbox-halium/anbox-halium/raw/lineage-17.1/scripts/run-container.sh
 chmod +x run-container.sh

+rm -f stop-container.sh
+wget https://github.com/Anbox-halium/anbox-halium/raw/lineage-17.1/scripts/stop-container.sh
+chmod +x stop-container.sh
+rm -f anbox-net.sh
+wget https://github.com/Anbox-halium/anbox-halium/raw/lineage-17.1/scripts/anbox-net.sh
+chmod +x anbox-net.sh

 
 if [ -f anbox.prop ]; then
     mv anbox.prop anbox.prop.bak
 fi
 
 if [ -f anbox.prop ]; then
     mv anbox.prop anbox.prop.bak
 fi

-if grep -q "spurv.display_height" anbox.prop.bak; then
-    grep "spurv.display_height" anbox.prop.bak >> anbox.prop
+if grep -q "anbox.display_height" anbox.prop.bak; then
+    grep "anbox.display_height" anbox.prop.bak >> anbox.prop

 else
     echo "NOTE: Edit /home/anbox/anbox.prop based on your device screen resolution"
 else
     echo "NOTE: Edit /home/anbox/anbox.prop based on your device screen resolution"

-    echo "spurv.display_height=1920" >> anbox.prop
+    echo "anbox.display_height=1920" >> anbox.prop

 fi
 fi

-if grep -q "spurv.display_width" anbox.prop.bak; then
-    grep "spurv.display_width" anbox.prop.bak >> anbox.prop
+if grep -q "anbox.display_width" anbox.prop.bak; then
+    grep "anbox.display_width" anbox.prop.bak >> anbox.prop

 else
     echo "NOTE: Edit /home/anbox/anbox.prop based on your device screen resolution"
 else
     echo "NOTE: Edit /home/anbox/anbox.prop based on your device screen resolution"

-    echo "spurv.display_width=1080" >> anbox.prop
+    echo "anbox.display_width=1080" >> anbox.prop

 fi
 fi

-echo "ro.hardware.gralloc=${GRALLOC}" >> anbox.prop
+echo "${GRALLOC_PROP}" >> anbox.prop

 echo "${EGL_PROP}" >> anbox.prop
 echo "${MEDIA_PROFILES_PROP}" >> anbox.prop
 echo "${EGL_PROP}" >> anbox.prop
 echo "${MEDIA_PROFILES_PROP}" >> anbox.prop

+echo "${CCODEC_PROP}" >> anbox.prop
+echo "${EXT_LIB_PROP}" >> anbox.prop
+echo "${VULKAN_PROP}" >> anbox.prop
+echo "${DPI_PROP}" >> anbox.prop
+echo "${GLES_VER_PROP}" >> anbox.prop
+echo "${XDG_PROP}" >> anbox.prop
+echo "${WAYLAND_DISP_PROP}" >> anbox.prop
+echo "${PULSE_PROP}" >> anbox.prop
+if [ -f NO_SENSORS ]; then
+       echo "anbox.stub_sensors_hal=1" >> anbox.prop
+       rm NO_SENSORS
+fi

 
 echo "Geting latest lxc config"
 mkdir /var/lib/lxc/anbox
 
 echo "Geting latest lxc config"
 mkdir /var/lib/lxc/anbox


@@ -114,4 +113,5 @@ initctl --user stop pulseaudio
 initctl --user start pulseaudio
 
 echo "Installing Finished!"
 initctl --user start pulseaudio
 
 echo "Installing Finished!"

-echo "Run anbox container with /home/anbox/run-container.sh on terminal"
+echo "Run anbox container with \"sudo /home/anbox/run-container.sh\" on terminal"
+echo "Stop anbox container with \"sudo /home/anbox/stop-container.sh\" on terminal"